From fe9799607f6b2f256a94ff8357ac1dbde001974a Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Tue, 29 May 2018 18:03:52 -0300 Subject: Minor grammar fixes --- data/sample-grammars/diablo-ii/diabloiiprefixes.gram | 3 --- 1 file changed, 3 deletions(-) (limited to 'data/sample-grammars/diablo-ii/diabloiiprefixes.gram') diff --git a/data/sample-grammars/diablo-ii/diabloiiprefixes.gram b/data/sample-grammars/diablo-ii/diabloiiprefixes.gram index c8ffd83..5157115 100755 --- a/data/sample-grammars/diablo-ii/diabloiiprefixes.gram +++ b/data/sample-grammars/diablo-ii/diabloiiprefixes.gram @@ -4,15 +4,12 @@ pragma export-rule [d2-prefix] -<<<<<<< HEAD [d2-prefix-chain] [d2-prefix-part] [d2-prefix-part] [d2-prefix-part] [d2-prefix-part] [d2-prefix-part] and [d2-prefix-part] [d2-prefix-part] and [d2-prefix-part] [d2-prefix-part] [d2-prefix-part] [d2-prefix-part] -======= ->>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1 [d2-prefix-part] [armor-class] [saving-throw] [foe-reaction] -- cgit v1.2.3