diff options
Diffstat (limited to 'data/sample-grammars/diablo-ii/diabloii.gram')
| -rwxr-xr-x | data/sample-grammars/diablo-ii/diabloii.gram | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/data/sample-grammars/diablo-ii/diabloii.gram b/data/sample-grammars/diablo-ii/diabloii.gram index df45482..edfe3b4 100755 --- a/data/sample-grammars/diablo-ii/diabloii.gram +++ b/data/sample-grammars/diablo-ii/diabloii.gram @@ -44,6 +44,7 @@ pragma prefix-with [money-type] [metal-type] gold platinum +<<<<<<< HEAD [item] [item-types] [item-types] [item-types] @@ -62,3 +63,11 @@ pragma prefix-with [money-type] [metal-type] [ds-items] [ds-gem] [ds-rune] [ds-armor] +======= +[item] [d2-item-type] + [d2-item-type] of [suffix] + [d2-item-type] of [suffix] and [suffix] + +pragma prefix-with [item] [prefix] +pragma prefix-with [item] [prefix] +>>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1 |