From 8ff6831c57ddbffe4b12dc2eb5a133e2c8775569 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Mon, 30 Jul 2018 21:52:45 +0200
Subject: [PATCH] Fix rebase errors

---
 src/openrct2/object/ObjectFactory.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp
index 9b4a3f2808..83cd82f5e4 100644
--- a/src/openrct2/object/ObjectFactory.cpp
+++ b/src/openrct2/object/ObjectFactory.cpp
@@ -154,9 +154,6 @@ namespace ObjectFactory
     static Object* CreateObjectFromJson(
         IObjectRepository& objectRepository, const json_t* jRoot, const IFileDataRetriever* fileRetriever);
 
-<<<<<<< HEAD
-    static void ReadObjectLegacy(Object* object, IReadObjectContext* context, IStream* stream)
-=======
     static uint8_t ParseSourceGame(const std::string &s)
     {
         static const std::unordered_map<std::string, uint8_t> LookupTable
@@ -176,8 +173,7 @@ namespace ObjectFactory
                OBJECT_SOURCE_CUSTOM;
     }
 
-    static void ReadObjectLegacy(Object * object, IReadObjectContext * context, IStream * stream)
->>>>>>> e280f8972... Attempt at showing secondary source game
+    static void ReadObjectLegacy(Object * object, IReadObjectContext* context, IStream* stream)
     {
         try
         {