diff options
| -rw-r--r-- | main.cpp | 1 | ||||
| -rw-r--r-- | src/world.cpp | 2 | ||||
| -rw-r--r-- | xml/playerSpawnHill1.xml | 5 |
3 files changed, 1 insertions, 7 deletions
@@ -628,7 +628,6 @@ void render(){ player->inv->draw(); /* -<<<<<<< HEAD * Here we draw a black overlay if it's been requested. */ diff --git a/src/world.cpp b/src/world.cpp index 51efaf2..a2758fa 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -1589,4 +1589,4 @@ World *loadWorldFromXMLNoSave(const char *path){ } return tmp; -} +}
\ No newline at end of file diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml index c5e736b..0c0fe4c 100644 --- a/xml/playerSpawnHill1.xml +++ b/xml/playerSpawnHill1.xml @@ -29,14 +29,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"> |