diff --git a/src/EditPlace.py b/src/EditPlace.py
index f40657013..ccfc0c56f 100644
--- a/src/EditPlace.py
+++ b/src/EditPlace.py
@@ -64,7 +64,6 @@ from WindowUtils import GladeIf
 #-------------------------------------------------------------------------
 class EditPlace(DisplayState.ManagedWindow):
 
-<<<<<<< EditPlace.py
     def __init__(self,place,dbstate,uistate):
         self.dbstate = dbstate
         self.uistate = uistate