.hgignore: remove merge markers

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

.hgignore: remove merge markers
R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/40720049
1e6996ff · Ian Lance Taylor · 5ddc6bd8 · 1e6996ff
Commit 1e6996ff authored Dec 12, 2013 by Ian Lance Taylor
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

.hgignore .hgignore +0 -3

No files found.
--- 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