diff options
Diffstat (limited to 'data/sample-grammars/diablo-ii/diabloiiprefixes.gram')
| -rwxr-xr-x | data/sample-grammars/diablo-ii/diabloiiprefixes.gram | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/data/sample-grammars/diablo-ii/diabloiiprefixes.gram b/data/sample-grammars/diablo-ii/diabloiiprefixes.gram index c8ffd83..5157115 100755 --- a/data/sample-grammars/diablo-ii/diabloiiprefixes.gram +++ b/data/sample-grammars/diablo-ii/diabloiiprefixes.gram @@ -4,15 +4,12 @@ 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] |