diff options
Diffstat (limited to 'RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram')
| -rwxr-xr-x | RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram index af6c9ec..f090292 100755 --- a/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram +++ b/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram @@ -20,9 +20,12 @@ pragma export-rule [perishables] skull blood ribcage +<<<<<<< HEAD viscera flesh claw +======= +>>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1 [perishable-type] potion oil |