diff options
-rw-r--r-- | .hgtags | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -1,7 +1,2 @@ -<<<<<<< /home/sheep/devel/hatta/.hgtags 10031321d4aef262912848d04c94ee8b59c64812 1.0.1 516b71176c517c099e1c6448dcc4192a83a4f5e6 1.0.2 -======= -c613f3b67f56524f2812e7d621cf0dd2cb45b22d 1.0.0rc -b95adb30e45d8cd7bcafe88a3cf74793adcb2790 1.0.0 ->>>>>>> /tmp/.hgtags~other.Cr8TE9 |