Work

diff --git a/main.cpp b/main.cpp
index 805fa000af09239faa37ba853071e4fdb3fe92ad..cf277cb1a8f421b4dd9bbe477b529ce6f207c9ee 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -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 51efaf2a193c79acf80888d002947e25c60bcc4c..a2758fa7c0f60890e89d92550d897a83e6100034 100644 (file)
--- 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 c5e736b960df556e200c785357dc466b29475940..0c0fe4ccb24e5f9af0c27fee39df054a056d6d7c 100644 (file)
--- 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">