diff options
| author | RadomirDopieralski <none@none> | 2008-11-16 23:04:43 (GMT) |
|---|---|---|
| committer | RadomirDopieralski <none@none> | 2008-11-16 23:04:43 (GMT) |
| commit | 1a892cfd3e06eb3b13b77cbe6cc1aaaf77489fe7 (patch) | |
| tree | b85b961ddde7303d62e09e7a14e415a78a8b62aa | |
| parent | 017ad05e6b58375dc4f08182ef7374464c440672 (diff) | |
resolve conflicts in tags1.1.0
| -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 |