.hgtags
changeset 8539 b699dc071e86
parent 7937 a6b5aefd586d
parent 8482 b033dcbeeabc
child 8540 4b91dadd77ca
--- a/.hgtags	Fri Oct 08 12:52:38 2010 +0200
+++ b/.hgtags	Thu Oct 14 15:43:36 2010 +0200
@@ -30,4 +30,10 @@
 41915c2f5ec639dadab8e797a1e5f1e0922fa029 2.50MP17
 f7b9678ebb10f1fb0963b7e3cc4724aa6aeca565 2.50MP18
 34eed7b386965b19e191fbfe03195588cdc75254 2.50MP19
+<<<<<<< local
 9910242bf4399dd2bd08959592b46fd3f5e4db7c demo-2.50MP20
+=======
+99ff33f6588973f7e738b6afd47ad44f3ac08d20 2.50MP20
+a3c1cffa8af7b60cab6949251fce1faaa13ca5bb 2.50MP21
+8ede6ac265f1dd70536888ce3e20ffd54e3a3bc6 2.50MP22
+>>>>>>> other