1 files changed, 0 insertions, 8 deletions
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 70dbd5c0576e..4889288caf09 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -688,15 +688,7 @@ protected:
 public:
     SwRefPageGetFieldType( SwDoc* pDoc );
     virtual SwFieldType*    Copy() const;
-<<<<<<< local
-    USHORT MakeSetList( _SetGetExpFlds& rTmpLst );
-=======
-
-    // ueberlagert, um alle RefPageGet-Felder zu updaten
-    virtual void Modify( SfxPoolItem *, SfxPoolItem * );
     sal_uInt16 MakeSetList( _SetGetExpFlds& rTmpLst );
-
->>>>>>> other
     SwDoc*  GetDoc() const                  { return pDoc; }
 };