From: Dmitriy Vyukov <dvyukov@google.com>
Date: Mon, 26 Nov 2012 18:14:43 +0000 (+0400)
Subject: cnd/gc: fix build
X-Git-Tag: go1.1rc2~1793
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7f0821805098ce7d7d58c6bf6c54d1a86b905ca9;p=gostls13.git

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 c7a802d21c..17e02a19b2 100644
--- 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;