diff options
| author | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2018-05-29 15:41:21 -0300 |
|---|---|---|
| committer | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2018-05-29 15:41:21 -0300 |
| commit | ca0f67d2fcb400974a0af1036d563c5cd2588bda (patch) | |
| tree | 77989e2c3cf4a8429ca31f8f2f40f355438df418 /RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram | |
| parent | 9356498bebab9342222cd87be669abae9d7ac3a2 (diff) | |
| parent | 66f5a43dee94657a56141c093488eccbf64c7ae1 (diff) | |
Merge
Diffstat (limited to 'RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram')
| -rwxr-xr-x | RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram index 5157115..c8ffd83 100755 --- a/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram +++ b/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram @@ -4,12 +4,15 @@ pragma export-rule [d2-prefix] +<<<<<<< HEAD [d2-prefix-chain] [d2-prefix-part] [d2-prefix-part] [d2-prefix-part] [d2-prefix-part] [d2-prefix-part] and [d2-prefix-part] [d2-prefix-part] and [d2-prefix-part] [d2-prefix-part] [d2-prefix-part] [d2-prefix-part] +======= +>>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1 [d2-prefix-part] [armor-class] [saving-throw] [foe-reaction] |