fixed conflict on Git

2019-05-23 14:06:12 -04:00
parent c5e73ec253
commit d597a1489b
1 changed files with 0 additions and 3 deletions
--- a/data/words.dat
+++ b/data/words.dat
@@ -46,12 +46,9 @@ warm bread, item
 clothes, item
 sword, item
 blanket, item
-<<<<<<< HEAD
 die, verb
-=======
 butter, item
 novel, item
 mop, item
 bucket, item
 towels, item
->>>>>>> branch 'master' of https://github.com/jslightham/Zork