--- a/hooks/syncschema.py	Thu Dec 03 17:17:43 2009 +0100
+++ b/hooks/syncschema.py	Mon Dec 07 05:09:09 2009 -0800
@@ -781,7 +781,6 @@
     * register an operation to add the entity type to the instance's
       schema on commit
     """
-<<<<<<< /home/syt/src/fcubicweb/cubicweb/hooks/syncschema.py
     __regid__ = 'syncaddcwetype'
     events = ('after_add_entity',)