From 025adc59aac8ab9e360463c1c0259ef7494d993f Mon Sep 17 00:00:00 2001
From: Christian Speckner <christian.speckner@mayflower.de>
Date: Mon, 29 Jan 2018 22:25:23 +0100
Subject: [PATCH] Merge fallout.

---
 src/windows/Stella.vcxproj.filters | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/windows/Stella.vcxproj.filters b/src/windows/Stella.vcxproj.filters
index 1cbe3f7bb..50126d528 100644
--- a/src/windows/Stella.vcxproj.filters
+++ b/src/windows/Stella.vcxproj.filters
@@ -888,7 +888,6 @@
     <ClCompile Include="..\emucore\tia\frame-manager\YStartDetector.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-<<<<<<< HEAD
     <ClCompile Include="..\common\AudioQueue.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
@@ -897,10 +896,8 @@
     </ClCompile>
     <ClCompile Include="..\emucore\tia\Audio.cxx">
       <Filter>Source Files\emucore\tia</Filter>
-=======
     <ClCompile Include="..\gui\TimeLineWidget.cxx">
       <Filter>Source Files\gui</Filter>
->>>>>>> master
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1831,7 +1828,6 @@
     <ClInclude Include="..\emucore\tia\TIAConstants.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-<<<<<<< HEAD
     <ClInclude Include="..\common\AudioQueue.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
@@ -1840,10 +1836,8 @@
     </ClInclude>
     <ClInclude Include="..\emucore\tia\Audio.hxx">
       <Filter>Header Files\emucore\tia</Filter>
-=======
     <ClInclude Include="..\gui\TimeLineWidget.hxx">
       <Filter>Header Files\gui</Filter>
->>>>>>> master
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -1857,4 +1851,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>