diff -r 45b8ab1b7c63 -r 0abed94a9859 .hgtags
--- a/.hgtags	Mon Sep 26 19:08:44 2011 +0200
+++ b/.hgtags	Mon Sep 26 19:09:12 2011 +0200
@@ -212,7 +212,6 @@
 cf49ed55685a810d8d73585330ad1a57cc76260d cubicweb-debian-version-3.12.8-1
 cb2990aaa63cbfe593bcf3afdbb9071e4c76815a cubicweb-version-3.12.9
 92464e39134c70e4ddbe6cd78a6e3338a3b88b05 cubicweb-debian-version-3.12.9-1
-<<<<<<< /home/syt/src/fcubicweb/cubicweb/.hgtags
 7d84317ef185a10c5eb78e6086f2297d2f4bd1e3 cubicweb-version-3.13.1
 cc0578049cbe8b1d40009728e36c17e45da1fc6b cubicweb-debian-version-3.13.1-1
 f9227b9d61835f03163b8133a96da35db37a0c8d cubicweb-version-3.13.2