Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove conflict marker stable
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Thu, 17 Mar 2011 11:38:52 +0100
branchstable
changeset 7089 6c6e0fbd0605
parent 7088 76e0dba5f8f3
child 7091 8052d2452b9c
remove conflict marker
devtools/cwwindmill.py file | annotate | diff | comparison | revisions 
--- 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
cubicweb