From 6eb635fd2b7592281b79b796cf5d1fd276cec8ea Mon Sep 17 00:00:00 2001
From: ddevrien <dennis@devriendt.eu>
Date: Fri, 9 May 2014 10:15:10 +0200
Subject: [PATCH] master project files

---
 projects/openrct2.vcxproj         | 4 ----
 projects/openrct2.vcxproj.filters | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj
index 094b40be3e..8438e163f6 100644
--- a/projects/openrct2.vcxproj
+++ b/projects/openrct2.vcxproj
@@ -98,11 +98,7 @@
     <ClCompile Include="..\src\window_ride_construction.c" />
     <ClCompile Include="..\src\window_ride_list.c" />
     <ClCompile Include="..\src\window_save_prompt.c" />
-<<<<<<< HEAD
     <ClCompile Include="..\src\window_staff.c" />
-=======
-    <ClCompile Include="..\src\window_banner.c" />
->>>>>>> 1eda151c704278e17de7b0ee88849342706b2bbc
     <ClCompile Include="..\src\window_title_exit.c" />
     <ClCompile Include="..\src\window_title_logo.c" />
     <ClCompile Include="..\src\window_main.c" />
diff --git a/projects/openrct2.vcxproj.filters b/projects/openrct2.vcxproj.filters
index c505b74ce7..c11377bf77 100644
--- a/projects/openrct2.vcxproj.filters
+++ b/projects/openrct2.vcxproj.filters
@@ -281,7 +281,6 @@
     <ClCompile Include="..\src\finance.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
     <ClCompile Include="..\src\window_ride_construction.c">
       <Filter>Windows</Filter>
     </ClCompile>
@@ -289,9 +288,6 @@
       <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="..\src\window_staff.c">
-=======
-    <ClCompile Include="..\src\window_banner.c">
->>>>>>> 1eda151c704278e17de7b0ee88849342706b2bbc
       <Filter>Windows</Filter>
     </ClCompile>
   </ItemGroup>