6 files changed, 3 insertions, 27 deletions
diff --git a/data/sample-grammars/computer.gram b/data/sample-grammars/computer.gram
index a3a7814..2978fb7 100755
--- a/data/sample-grammars/computer.gram
+++ b/data/sample-grammars/computer.gram
@@ -39,7 +39,6 @@
 	malbolge
 
 pragma export-rule [computer-language]
-pragma export-rule [computer-skill]
 
 [computer-skill] html
 	xml
@@ -51,3 +50,5 @@ pragma export-rule [computer-skill]
 	sql
 	asp
 	php
+
+pragma export-rule [computer-skill]
diff --git a/data/sample-grammars/diablo-ii/diabloii.gram b/data/sample-grammars/diablo-ii/diabloii.gram
index edfe3b4..df45482 100755
--- a/data/sample-grammars/diablo-ii/diabloii.gram
+++ b/data/sample-grammars/diablo-ii/diabloii.gram
@@ -44,7 +44,6 @@ pragma prefix-with [money-type] [metal-type]
 	gold
 	platinum
 
-<<<<<<< HEAD
 [item] [item-types]
 	[item-types]
 	[item-types]
@@ -63,11 +62,3 @@ 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
diff --git a/data/sample-grammars/diablo-ii/diabloiiitems.gram b/data/sample-grammars/diablo-ii/diabloiiitems.gram
index 6997521..5fa174b 100755
--- a/data/sample-grammars/diablo-ii/diabloiiitems.gram
+++ b/data/sample-grammars/diablo-ii/diabloiiitems.gram
@@ -16,17 +16,7 @@
 	[gems]
 	[inscriptions]
 	[perishables]
-	[ds-items]
-	[ds-items]
-	[ds-items]
 
-<<<<<<< HEAD
-=======
-[ds-items] [ds-gem]
-	[ds-rune]
-	[ds-armor]
-
->>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1
 pragma export-rule [d2-item-type]
 
 [armor] [light-armor]
diff --git a/data/sample-grammars/diablo-ii/diabloiiperish.gram b/data/sample-grammars/diablo-ii/diabloiiperish.gram
index f090292..af6c9ec 100755
--- a/data/sample-grammars/diablo-ii/diabloiiperish.gram
+++ b/data/sample-grammars/diablo-ii/diabloiiperish.gram
@@ -20,12 +20,9 @@ pragma export-rule [perishables]
 	skull
 	blood
 	ribcage
-<<<<<<< HEAD
 	viscera
 	flesh
 	claw
-=======
->>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1
 
 [perishable-type] potion
 	oil
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]
diff --git a/data/todos.txt b/data/todos.txt
index 9ea08a2..a382a05 100755
--- a/data/todos.txt
+++ b/data/todos.txt
@@ -1,4 +1,4 @@
-:TODO 5/10/18 Ben Culkin :EasternSun
+@TODO 5/10/18 Ben Culkin :EasternSun
 	Finish up the new-style Diablo generator, using Eastern Sun things
 
 @TODO 10/11/17 Ben Culkin :GrammarReorg