From 5e35e7f7465407680e7f30151b0070fb2b1237a8 Mon Sep 17 00:00:00 2001
From: Stefanos Kornilios Mitsis Poiitidis <skmp@nillware.com>
Date: Tue, 22 Apr 2014 17:32:04 +0300
Subject: [PATCH] Initial webui code (that does nothing useful)

I plan to port over the existing nulldc debugger stuff to a webui so we can do remote debugging on android and more
---
 shell/reicast.vcxproj.filters | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/shell/reicast.vcxproj.filters b/shell/reicast.vcxproj.filters
index 76a6affc1..d6aae57df 100644
--- a/shell/reicast.vcxproj.filters
+++ b/shell/reicast.vcxproj.filters
@@ -509,12 +509,9 @@
     <Filter Include="deps\libwebsocket">
       <UniqueIdentifier>{3d3de3ff-9e79-4920-a95a-61d190e73004}</UniqueIdentifier>
     </Filter>
-<<<<<<< HEAD
     <Filter Include="webui">
       <UniqueIdentifier>{81193efc-656a-4154-9adf-146856d4c7d3}</UniqueIdentifier>
     </Filter>
-=======
->>>>>>> add libwebsocket
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\core\hw\aica\aica.h">
@@ -859,12 +856,9 @@
     <ClInclude Include="..\core\deps\libwebsocket\private-libwebsockets.h">
       <Filter>deps\libwebsocket</Filter>
     </ClInclude>
-<<<<<<< HEAD
     <ClInclude Include="..\core\webui\server.h">
       <Filter>webui</Filter>
     </ClInclude>
-=======
->>>>>>> add libwebsocket
   </ItemGroup>
   <ItemGroup>
     <None Include="..\core\deps\zlib\Makefile">