cmd/go: remove merge markers
cmd/go: remove merge markers

LGTM=minux.ma
R=cespare, rsc, minux.ma
CC=golang-codereviews
https://codereview.appspot.com/96210043

Committer: Shenghou Ma <b563c57947dc20eb81988e3e3c22786764c14ca8@gmail.com>

apparentlymart/golang,apparentlymart/golang,apparentlymart/golang,apparentlymart/golang,apparentlymart/golang,apparentlymart/golang,apparentlymart/golang