--- a/web/form.py	Thu Dec 03 17:17:43 2009 +0100
+++ b/web/form.py	Mon Dec 07 05:09:09 2009 -0800
@@ -36,8 +36,6 @@
         return False
 
 
-<<<<<<< /home/syt/src/fcubicweb/cubicweb/web/form.py
-=======
 # XXX should disappear
 class FormMixIn(object):
     """abstract form mix-in
@@ -192,7 +190,6 @@
 
 ###############################################################################
 
->>>>>>> /tmp/form.py~other.xdns1y
 class metafieldsform(type):
     """metaclass for FieldsForm to retrieve fields defined as class attributes
     and put them into a single ordered list: '_fields_'.