From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 13 Dec 2013 01:25:02 +0000 (-0800)
Subject: .hgignore: remove merge markers
X-Git-Tag: go1.3beta1~1245
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1e6996ff2e4360db0b6f87f11688d7b23831be06;p=gostls13.git

.hgignore: remove merge markers

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

diff --git a/.hgignore b/.hgignore
index 69141f86a6..b615b8d975 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