diff options
Diffstat (limited to 'RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram')
| -rwxr-xr-x | RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram index 8450b97..6997521 100755 --- a/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram +++ b/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram @@ -20,10 +20,13 @@ [ds-items] [ds-items] +<<<<<<< HEAD +======= [ds-items] [ds-gem] [ds-rune] [ds-armor] +>>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1 pragma export-rule [d2-item-type] [armor] [light-armor] |