Fixed conflicts

2019-05-27 14:43:00 -04:00
parent 9dede87f7f c0fc0bc2cf
commit 81bd3b1c86
7 changed files with 89 additions and 13 deletions
--- a/data/words.dat
+++ b/data/words.dat
@@ -57,4 +57,5 @@ open, verb
 i, verb
 unlock, verb
 drop, verb
-HenryPelatt, enemy
+henrypelatt, enemy
+attack, verb