Skip to content

G
golang
Commit 1e6996ff authored by Ian Lance Taylor's avatar Ian Lance Taylor
Browse files
Options

.hgignore: remove merge markers 

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/40720049
parent 5ddc6bd8
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
.hgignore
View file @ 1e6996ff
...@@ -33,10 +33,7 @@ misc/goplay/goplay ...@@ -33,10 +33,7 @@ misc/goplay/goplay
misc/osx/*.pkg misc/osx/*.pkg
misc/osx/*.dmg misc/osx/*.dmg
src/cmd/?a/y.output src/cmd/?a/y.output
<<<<<<< local
=======
src/liblink/anames?.c src/liblink/anames?.c
>>>>>>> other
src/cmd/cc/y.output src/cmd/cc/y.output
src/cmd/cgo/zdefaultcc.go src/cmd/cgo/zdefaultcc.go
src/cmd/dist/dist.dSYM src/cmd/dist/dist.dSYM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment