diff options
Diffstat (limited to 'data/sample-grammars/diablo-ii/diabloiiperish.gram')
| -rwxr-xr-x | data/sample-grammars/diablo-ii/diabloiiperish.gram | 3 |
1 files changed, 0 insertions, 3 deletions
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 |