--- a/devtools/cwwindmill.py	Wed Mar 16 18:12:57 2011 +0100
+++ b/devtools/cwwindmill.py	Thu Mar 17 11:38:52 2011 +0100
@@ -89,7 +89,6 @@
         Instead of toggle `edit_test` value, try `python <test script> -f`
         """
         browser = 'firefox'
-<<<<<<< /home/syt/src/fcubicweb/cubicweb/devtools/cwwindmill.py
 
         edit_test = "-i" in sys.argv # detection for pytest invocation
         # Windmill use case are written with no anonymous user