--- a/app/soc/logic/models/survey.py	Tue Jun 30 17:55:43 2009 +0200
+++ b/app/soc/logic/models/survey.py	Tue Jun 30 18:02:10 2009 +0200
@@ -193,15 +193,12 @@
 
     return self.getForFields(fields, unique=True)
 
-<<<<<<< local
-=======
   def getRecordLogic(self):
     """Returns SurveyRecordLogic that belongs to this SurveyLogic.
     """
 
     return self.record_logic
 
->>>>>>> other
   def getUserRole(self, user, survey, project):
     """Gets the role of a user for a project, used for SurveyRecordGroup.