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/diabloiiperish.gram | 3 --- 1 file changed, 3 deletions(-) (limited to 'data/sample-grammars/diablo-ii/diabloiiperish.gram') diff --git a/data/sample-grammars/diablo-ii/diabloiiperish.gram b/data/sample-grammars/diablo-ii/diabloiiperish.gram index f090292..af6c9ec 100755 --- a/data/sample-grammars/diablo-ii/diabloiiperish.gram +++ b/data/sample-grammars/diablo-ii/diabloiiperish.gram @@ -20,12 +20,9 @@ pragma export-rule [perishables] skull blood ribcage -<<<<<<< HEAD viscera flesh claw -======= ->>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1 [perishable-type] potion oil -- cgit v1.2.3