languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-15 22:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

.hgignore: remove merge markers

Browse source 
R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/40720049
This commit is contained in:
Ian Lance Taylor 2013-12-12 17:25:02 -08:00
parent 5ddc6bd84d
commit 1e6996ff2e
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.hgignore
View file

@ -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