From d597a1489b8d8afa97272e7fad463427c5acf00d Mon Sep 17 00:00:00 2001
From: Luca Carnegie <41924665+lcarnegie@users.noreply.github.com>
Date: Thu, 23 May 2019 14:06:12 -0400
Subject: [PATCH] fixed conflict on Git

---
 data/words.dat | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/data/words.dat b/data/words.dat
index fa5667f..03add56 100644
--- 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