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/diabloiiitems.gram | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'data/sample-grammars/diablo-ii/diabloiiitems.gram') diff --git a/data/sample-grammars/diablo-ii/diabloiiitems.gram b/data/sample-grammars/diablo-ii/diabloiiitems.gram index 6997521..5fa174b 100755 --- a/data/sample-grammars/diablo-ii/diabloiiitems.gram +++ b/data/sample-grammars/diablo-ii/diabloiiitems.gram @@ -16,17 +16,7 @@ [gems] [inscriptions] [perishables] - [ds-items] - [ds-items] - [ds-items] -<<<<<<< HEAD -======= -[ds-items] [ds-gem] - [ds-rune] - [ds-armor] - ->>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1 pragma export-rule [d2-item-type] [armor] [light-armor] -- cgit v1.2.3