From f55e19a76fe5e95779f4bf285a287a0756cae1a9 Mon Sep 17 00:00:00 2001
From: Johnathon Slightham <31053827+jslightham@users.noreply.github.com>
Date: Wed, 29 May 2019 12:57:42 -0400
Subject: [PATCH] fix conflicts

---
 data/rooms.dat | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/data/rooms.dat b/data/rooms.dat
index 3cef446..dd7a511 100644
--- a/data/rooms.dat
+++ b/data/rooms.dat
@@ -3,7 +3,7 @@ Room Description: You are in a circular room. The windows to the east are covere
 Locked: false
 Boarded: false
 Items:Lockpick,Milk
-Riddle: "Who is never hungry during Christmas?", "The turkey because he is always stuffed."
+Riddle: "Who is never hungry during Christmas?", "The turkey because he is always stuffed."
 Exit Rooms: W-Apple Hallway
 
 Room name: Apple Hallway
@@ -169,14 +169,9 @@ Exit Rooms: S-Apsen Bedroom, E-Willow Bedroom
 Room name: Guest Bedroom
 Room Description: Welcome to the guest bedroom, where guests like yourself stay for the night. Except Sir Pellatt has other plans for you... There is faint writing on the west wall. Might want to take a look...
 Locked: false
-<<<<<<< HEAD
 Boarded: false
 Items: Scroll 2 
-Riddle:
-=======
-Items:  
 Riddle: "What letter comes next in this sequence: o,t,t,f,f?", "s"
->>>>>>> 8e73e9e0244c32a530f67daa085e1b453b1eca7d
 Exit Rooms: E-Linen Closet, S-Another Sitting Area
 
 Room name: Silver Stairs (1st Floor)
@@ -289,4 +284,4 @@ Locked: false
 Boarded: false
 Items:Key
 Riddle:
-Exit Rooms: N-Library, E-Entry, W-Serving and Breakfast Room 
\ No newline at end of file
+Exit Rooms: N-Library, E-Entry, W-Serving and Breakfast Room