jslightham/Zork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict on Git

Browse Source
This commit is contained in:
Luca Carnegie
2019-05-23 14:06:12 -04:00
parent c5e73ec253
commit d597a1489b
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/words.dat
View File

@@ -46,12 +46,9 @@ warm bread, item
clothes, item clothes, item
sword, item sword, item
blanket, item blanket, item
<<<<<<< HEAD
die, verb die, verb
=======
butter, item butter, item
novel, item novel, item
mop, item mop, item
bucket, item bucket, item
towels, item towels, item
>>>>>>> branch 'master' of https://github.com/jslightham/Zork