From c7e21a9fafbf1b0935c6e2b689e5224d3f4788ca Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Tue, 6 Dec 2005 20:45:41 +0000
Subject: [PATCH] fix typo

svn: r5487
---
 gramps2/src/EditPlace.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py
index f40657013..ccfc0c56f 100644
--- a/gramps2/src/EditPlace.py
+++ b/gramps2/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