From f2316604ad7622090318a272b434a3397b24e8dd Mon Sep 17 00:00:00 2001
From: tomcw <tomcw@users.noreply.github.com>
Date: Tue, 6 Sep 2016 16:57:44 +0100
Subject: [PATCH] Resolve merge conflicts from VS2013,VS2015 vcxproj.filters
 files

---
 .gitignore                          |  1 +
 AppleWinExpress2013.vcxproj.filters | 12 +++---------
 AppleWinExpress2015.vcxproj.filters | 12 +++---------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 03c74460..7b96eb2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.user
 *.sln.docstates
 *.VC.opendb
+*.VC.db
 
 # Build results
 [Dd]ebug/
diff --git a/AppleWinExpress2013.vcxproj.filters b/AppleWinExpress2013.vcxproj.filters
index 2d24a23e..f1ac4d2c 100644
--- a/AppleWinExpress2013.vcxproj.filters
+++ b/AppleWinExpress2013.vcxproj.filters
@@ -429,12 +429,12 @@
     <ClInclude Include="source\DiskDefs.h">
       <Filter>Source Files\Disk</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="source\NTSC.h">
       <Filter>Source Files\Video</Filter>
     </ClInclude>
->>>>>>> NTSC_PreMerge
+    <ClInclude Include="source\NTSC_CharSet.h">
+      <Filter>Source Files\Video</Filter>
+    </ClInclude>
     <ClInclude Include="source\Pravets.h">
       <Filter>Source Files\Model</Filter>
     </ClInclude>
@@ -450,12 +450,6 @@
     <ClInclude Include="source\SaveState_Structs_v1.h">
       <Filter>Source Files\_Headers</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
-    <ClInclude Include="source\NTSC_CharSet.h">
-      <Filter>Source Files\Video</Filter>
-    </ClInclude>
->>>>>>> NTSC_PreMerge
   </ItemGroup>
   <ItemGroup>
     <Image Include="resource\Applewin.bmp">
diff --git a/AppleWinExpress2015.vcxproj.filters b/AppleWinExpress2015.vcxproj.filters
index 2d24a23e..f1ac4d2c 100644
--- a/AppleWinExpress2015.vcxproj.filters
+++ b/AppleWinExpress2015.vcxproj.filters
@@ -429,12 +429,12 @@
     <ClInclude Include="source\DiskDefs.h">
       <Filter>Source Files\Disk</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="source\NTSC.h">
       <Filter>Source Files\Video</Filter>
     </ClInclude>
->>>>>>> NTSC_PreMerge
+    <ClInclude Include="source\NTSC_CharSet.h">
+      <Filter>Source Files\Video</Filter>
+    </ClInclude>
     <ClInclude Include="source\Pravets.h">
       <Filter>Source Files\Model</Filter>
     </ClInclude>
@@ -450,12 +450,6 @@
     <ClInclude Include="source\SaveState_Structs_v1.h">
       <Filter>Source Files\_Headers</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
-    <ClInclude Include="source\NTSC_CharSet.h">
-      <Filter>Source Files\Video</Filter>
-    </ClInclude>
->>>>>>> NTSC_PreMerge
   </ItemGroup>
   <ItemGroup>
     <Image Include="resource\Applewin.bmp">