diff options
| author | Ian Lance Taylor <iant@golang.org> | 2013-12-12 17:25:02 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2013-12-12 17:25:02 -0800 |
| commit | 9dc2e3cd2566723a3e576097a11586ac7baf197c (patch) | |
| tree | 1fb2249a106f2f62d58409dbe67cb326e66e4ba5 | |
| parent | bcdee25793fa7d02dbe8f2795b83c0ae05a40541 (diff) | |
| download | go-9dc2e3cd2566723a3e576097a11586ac7baf197c.tar.gz | |
.hgignore: remove merge markers
R=golang-dev, dsymonds
CC=golang-dev
https://codereview.appspot.com/40720049
| -rw-r--r-- | .hgignore | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -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 |