Commits

Anonymous committed 41d760a

masterfix: #i10000# remove conflict marks

  • Participants
  • Parent commits f9fd2a3

Comments (0)

Files changed (2)

File sd/source/ui/inc/PaneDockingWindow.hxx

     virtual ~PaneDockingWindow (void);
 
 	virtual void StateChanged( StateChangedType nType );
-<<<<<<< local
-=======
-	virtual void DataChanged( const DataChangedEvent& rDCEvt );
+	
+    virtual void DataChanged( const DataChangedEvent& rDCEvt );
 
     /** Initializing the title tool box either creates a new title tool box
         or clears all items from an existing one.  A closer is added as only
         last invocation the size of the docking window has changed.
     */
     void Layout (void);
->>>>>>> other
 };
 
 } // end of namespace ::sd

File sd/source/ui/inc/framework/ViewShellWrapper.hxx

     */
     ::boost::shared_ptr<ViewShell> GetViewShell (void);
 
-<<<<<<< local
-=======
-
->>>>>>> other
     // XUnoTunnel
 
     virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId)