resolve go.y edits

R=r
OCL=14132
CL=14132

diff --git a/src/cmd/gc/go.y b/src/cmd/gc/go.y
index a997193d4581c24c5d4f857d9695232a5879cc04..f660c887a76c32d2b1547e27da6222e28e1b73ac 100644 (file)
--- a/src/cmd/gc/go.y
+++ b/src/cmd/gc/go.y
@@ -840,12 +840,7 @@ sym2:
 
 /*
  * keywords that we can
->>>> ORIGINAL go/src/cmd/gc/go.y#8
-==== THEIRS go/src/cmd/gc/go.y#9
- * use as field names
-==== YOURS go/src/cmd/gc/go.y
- * use a variable/type names
-<<<<
+ * use as variable/type names
  */
 key1:
        LNIL
@@ -860,6 +855,7 @@ key1:
 
 /*
  * keywords that we can
+ * use as field names
  */
 key2:
        LPACKAGE
@@ -890,36 +886,6 @@ key2:
 |      LRANGE
 |      LIGNORE
 
->>>> ORIGINAL go/src/cmd/gc/go.y#8
- * use a variable/type names
- */
-key2:
-       LNIL
-|      LTRUE
-|      LFALSE
-|      LIOTA
-|      LLEN
-|      LPANIC
-|      LPRINT
-|      LNEW
-|      LBASETYPE
-
-==== THEIRS go/src/cmd/gc/go.y#9
- * use as variable/type names
- */
-key2:
-       LNIL
-|      LTRUE
-|      LFALSE
-|      LIOTA
-|      LLEN
-|      LPANIC
-|      LPRINT
-|      LNEW
-|      LBASETYPE
-
-==== YOURS src/cmd/gc/go.y
-<<<<
 name:
        lname
        {