From 0075f9e7997d01fa2105bff38e40a3d5b8b421e6 Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Fri, 19 Feb 2016 18:33:29 -0500
Subject: Village work

---
 xml/playerSpawnHill1.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'xml')

diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml
index c5e736b..b0fb163 100644
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@ -11,6 +11,10 @@
 	<npc name="Ralph" hasDialog="true" />
 	<npc name="Johnny" hasDialog="false" />
 	<structure type="5" inside="playerSpawnHill1_Building1.xml" />
+	<village name="Meme-Town">
+		<structure type="0" inside="playerSpawnHill1_Building1.xml" />
+		<structure type="5" inside="playerSpawnHill1_Building1.xml" />
+	</village>
 
 </World>
 
@@ -29,14 +33,9 @@ And it wasn't stormy.
 		You should go talk to my friend Johnny. He's a pretty chill dude.
 	</text>
 	
-<<<<<<< HEAD
-	<text id="2" call="Johnny" callid="1">
-		what you have done it to trick Microsoft?
-=======
 	<text id="2" >
 		Niice.
 		<quest check="Your First Quest" fail="3" />
->>>>>>> 3033594b89f23e65b6152daa6610f991307f2f67
 	</text>
 	
 	<text id="3">
-- 
cgit v1.2.3