.hgignore: remove merge markers
.hgignore: remove merge markers

R=golang-dev, dsymonds
CC=golang-dev
https://codereview.appspot.com/40720049

pombredanne/go-deleteme,pombredanne/go-deleteme,tv42/old-go,tv42/old-go,tv42/old-go,tv42/old-go,pombredanne/go-deleteme,pombredanne/go-deleteme,tv42/old-go,tv42/old-go,pombredanne/go-deleteme,pombredanne/go-deleteme,tv42/old-go,pombredanne/go-deleteme