removes merge conflict chars from previous merge in hgtags
authorJordan Lund <jlund@mozilla.com>
Wed, 30 Nov 2016 14:22:33 -0800
changeset 7187 dce0e0a53fa25020469e5c01862cb6bfcefe3d99
parent 7186 d5f4899b1b82b44dd424b3ea21265d4e87c25ef0
child 7188 cca3e54cc9848f8fca36c57011d81e9967b67bcc
push id5357
push userjlund@mozilla.com
push dateWed, 30 Nov 2016 22:22:39 +0000
removes merge conflict chars from previous merge in hgtags MozReview-Commit-ID: EbBS1BC0MqP
.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -6272,17 +6272,16 @@ 2e12e337a866520c11290d167adfa7d9d887836e
 cbe73821f0d49ae53d7350bc453ec4c6ceb8f74d FIREFOX_51_0b3_BUILD1_RUNTIME
 cbe73821f0d49ae53d7350bc453ec4c6ceb8f74d FIREFOX_51_0b3_RELEASE_RUNTIME
 719eff9aaf3a779a442f65dfe9c47edd254bd5c4 FIREFOX_50_0_1_BUILD1_RUNTIME
 719eff9aaf3a779a442f65dfe9c47edd254bd5c4 FIREFOX_50_0_1_RELEASE_RUNTIME
 719eff9aaf3a779a442f65dfe9c47edd254bd5c4 FIREFOX_50_0_1_BUILD1_RUNTIME
 8b0697d032a57228a8fce5538e3595dfbc6b4291 FIREFOX_50_0_1_BUILD1_RUNTIME
 719eff9aaf3a779a442f65dfe9c47edd254bd5c4 FIREFOX_50_0_1_RELEASE_RUNTIME
 8b0697d032a57228a8fce5538e3595dfbc6b4291 FIREFOX_50_0_1_RELEASE_RUNTIME
-<<<<<<< local
 66b5c0b05dead482646b7de05216040145bd4060 FENNEC_51_0b4_RELEASE
 66b5c0b05dead482646b7de05216040145bd4060 FENNEC_51_0b4_BUILD1
 5efb8c64feea298253f2652c71ec97816322ef28 FIREFOX_51_0b4_BUILD1_RUNTIME
 5efb8c64feea298253f2652c71ec97816322ef28 FIREFOX_51_0b4_RELEASE_RUNTIME
 66b3f2263dfc51c4147d121aa59d6e9c15346216 FENNEC_50_0_2_RELEASE
 66b3f2263dfc51c4147d121aa59d6e9c15346216 FENNEC_50_0_2_BUILD1
 40057c2d64d4aba81767dbe5b92bd64115858a32 FENNEC_51_0b5_BUILD1
 40057c2d64d4aba81767dbe5b92bd64115858a32 FENNEC_51_0b5_RELEASE