--- a/server/test/unittest_multisources.py	Wed Jan 05 17:50:21 2011 +0100
+++ b/server/test/unittest_multisources.py	Wed Jan 05 18:42:21 2011 +0100
@@ -45,7 +45,6 @@
 PyroRQLSource_get_connection = PyroRQLSource.get_connection
 Connection_close = Connection.close
 
-<<<<<<< /home/syt/src/fcubicweb/cubicweb/server/test/unittest_multisources.py
 def add_extern_mapping(source):
     execute = source._cw.execute
     for etype in ('Card', 'Affaire', 'State'):
@@ -56,10 +55,7 @@
                        {'rtype': rtype, 's': source.eid})
 
 
-def setup_module(*args):
-=======
 def setUpModule(*args):
->>>>>>> /tmp/unittest_multisources.py~other.zhOXgM
     global repo2, cnx2, repo3, cnx3
     cfg1 = ExternalSource1Configuration('data', apphome=TwoSourcesTC.datadir)
     repo2, cnx2 = init_test_database(config=cfg1)