--- a/.hgtags	Mon Sep 26 18:36:09 2011 +0200
+++ b/.hgtags	Mon Sep 26 18:38:38 2011 +0200
@@ -212,6 +212,7 @@
 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
@@ -223,3 +224,5 @@
 a62f24e1497e953fbaed5894f6064a64f7ac0be3 cubicweb-version-3.10.x
 20d9c550c57eb6f9adcb0cfab1c11b6b8793afb6 cubicweb-version-3.13.5
 2e9dd7d945557c210d3b79153c65f6885e755315 cubicweb-debian-version-3.13.5-1
+074c848a3712a77737d9a1bfbb618c75f5c0cbfa cubicweb-version-3.12.10
+9dfd21fa0a8b9f121a08866ad3e2ebd1dd06790d cubicweb-debian-version-3.12.10-1