cnd/gc: fix build

R=golang-dev
CC=golang-dev
https://golang.org/cl/6856097

diff --git a/src/cmd/gc/racewalk.c b/src/cmd/gc/racewalk.c
index c7a802d21cdc1a841faa9a6f467ab06a7cbd1800..17e02a19b2b8fbe655a2b0ee184197e62f7837e5 100644 (file)
--- a/src/cmd/gc/racewalk.c
+++ b/src/cmd/gc/racewalk.c
@@ -430,11 +430,8 @@ callinstr(Node **np, NodeList **init, int wr, int skip)
                                n = treecopy(n);
                                f = nod(OXDOT, n, newname(t1->sym));
                                f->type = t1;
-<<<<<<< local
                                if(f->type->etype == TFIELD)
                                        f->type = f->type->type;
-=======
->>>>>>> other
                                if(callinstr(&f, init, wr, 0)) {
                                        typecheck(&f, Erv);
                                        res = 1;