1 files changed, 0 insertions, 3 deletions
diff --git a/.hgignore b/.hgignore
index 69141f86a..b615b8d97 100644
--- 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