diff options
| author | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2018-05-29 18:03:52 -0300 |
|---|---|---|
| committer | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2018-05-29 18:03:52 -0300 |
| commit | fe9799607f6b2f256a94ff8357ac1dbde001974a (patch) | |
| tree | e6bcc2a65bff714097abe7c2dd968d63cd077ab5 /data/sample-grammars/diablo-ii/diabloiiperish.gram | |
| parent | faf3e39fee32226ee72c6d43b2ba8a0f4e4bd837 (diff) | |
Minor grammar fixes
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 |