.hgignore: remove merge markers

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/40720049

diff --git a/.hgignore b/.hgignore
index 69141f86a6993edfd6b8a591e1362ea7f2457725..b615b8d975241d20131d15c86c608692a0f23bbc 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -33,10 +33,7 @@ misc/goplay/goplay
 misc/osx/*.pkg
 misc/osx/*.dmg
 src/cmd/?a/y.output
-<<<<<<< local
-=======
 src/liblink/anames?.c
->>>>>>> other
 src/cmd/cc/y.output
 src/cmd/cgo/zdefaultcc.go
 src/cmd/dist/dist.dSYM