--- a/devtools/cwwindmill.py	Fri Mar 11 12:17:32 2011 +0100
+++ b/devtools/cwwindmill.py	Thu Mar 24 15:21:13 2011 +0100
@@ -89,11 +89,10 @@
         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
-        anonymous_logged = False
+        anonymous_allowed = False
 
         tags = CubicWebServerTC.tags & Tags(('windmill',))