diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-11-15 12:10:01 -0800 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-11-15 12:10:01 -0800 |
| commit | fd0d348f8f8c885a6120686e4175b544e6806707 (patch) | |
| tree | ba625326fd5e5ced995ea476a249c8d6ea8dd36e | |
| parent | 5bfa6095db3a0a9c7367b7dde3f2e24e023cb7f4 (diff) | |
Fixed .hgtags conflicts
| -rw-r--r-- | .hgtags | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -29,12 +29,8 @@ c6e6324f5be1401f077ad18a4a0f6b46451c2f7b last_sprint 9822eb3e25f7fe0c28ffd8aba45c507caa383cbc 2.2.0-beta2 b0cd7e150009809a0b5b0a9d5785cd4bb230413a 2.2.0-beta3 00a831292231faad7e44c69f76cb96f175b8dfad 2.2.0-beta4 -<<<<<<< /var/tmp/dessie/hg/viewer-release/.hgtags -1415e6538d54fd5d568ee88343424d57c6803c2c 2.2.0-release -======= 1415e6538d54fd5d568ee88343424d57c6803c2c 2.2.0-release 98e0d6df638429fd2f0476667504bd5a6b298def 2.3.0-start a3c12342b1af0951b8aa3b828aacef17fcea8178 2.3.0-beta1 db0fe9bb65187f365e58a717dd23d0f4754a9c1d 2.3.0-beta2 6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 2.3.0-beta3 ->>>>>>> /tmp/.hgtags~other.m_FhNW |