present/code.go: remove residual file from an hg merge.
present/code.go: remove residual file from an hg merge.

R=adg
CC=golang-dev
https://codereview.appspot.com/14043043

Committer: Andrew Gerrand <395a7d33bec8475c9b83b7d440f141bcbd994aa5@golang.org>

tmc/mirror-go.tools,tmc/mirror-go.tools,tmc/mirror-go.tools,t-yuki/go.tools.old,t-yuki/go.tools.old,t-yuki/go.tools.old