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.
fix bad merge
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Wed, 07 Jul 2010 13:50:55 +0200
changeset 5923 d1b374aa5174
parent 5922 59dfda8e232c
child 5924 b218df942dd4
fix bad merge
debian/control file | annotate | diff | comparison | revisions 
--- a/debian/control	Wed Jul 07 13:42:49 2010 +0200
+++ b/debian/control	Wed Jul 07 13:50:55 2010 +0200
@@ -97,11 +97,7 @@
 Package: cubicweb-common
 Architecture: all
 XB-Python-Version: ${python:Versions}
-<<<<<<< /home/syt/src/fcubicweb/cubicweb/debian/control
-Depends: ${python:Depends}, graphviz, gettext, python-logilab-mtconverter (>= 0.8.0), python-logilab-common (>= 0.50.2), python-yams (>= 0.29.1), python-rql (>= 0.26.2), python-lxml
-=======
-Depends: ${python:Depends}, graphviz, gettext, python-logilab-mtconverter (>= 0.6.0), python-logilab-common (>= 0.50.2), python-yams (>= 0.29.0), python-rql (>= 0.26.3), python-lxml
->>>>>>> /tmp/control~other.bzaFre
+Depends: ${python:Depends}, graphviz, gettext, python-logilab-mtconverter (>= 0.8.0), python-logilab-common (>= 0.50.2), python-yams (>= 0.29.1), python-rql (>= 0.26.3), python-lxml
 Recommends: python-simpletal (>= 4.0), python-crypto
 Conflicts: cubicweb-core
 Replaces: cubicweb-core
cubicweb