From 44a4de1c173a0ab88ff3aa519b3a25888f2eff85 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Tue, 23 May 2017 20:36:16 -0400
Subject: web browser + fix shiftorium merge conflict

---
 ShiftOS.WinForms/ShiftOS.WinForms.csproj | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'ShiftOS.WinForms/ShiftOS.WinForms.csproj')

diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index b74003f..9675744 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -274,6 +274,12 @@
     <Compile Include="Applications\VideoPlayer.Designer.cs">
       <DependentUpon>VideoPlayer.cs</DependentUpon>
     </Compile>
+    <Compile Include="Applications\WebBrowser.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Applications\WebBrowser.Designer.cs">
+      <DependentUpon>WebBrowser.cs</DependentUpon>
+    </Compile>
     <Compile Include="Applications\WidgetManagerFrontend.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -523,6 +529,9 @@
     <EmbeddedResource Include="Applications\VideoPlayer.resx">
       <DependentUpon>VideoPlayer.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Applications\WebBrowser.resx">
+      <DependentUpon>WebBrowser.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Applications\WidgetManagerFrontend.resx">
       <DependentUpon>WidgetManagerFrontend.cs</DependentUpon>
     </EmbeddedResource>
-- 
cgit v1.2.3