From 1bd96f6a88488bf8a73a105e69b8ecbd42a23590 Mon Sep 17 00:00:00 2001
From: nmat <nmat@users.noreply.github.com>
Date: Thu, 27 Dec 2018 22:25:10 +0100
Subject: [PATCH] not sure if this fixes it

test
---
 mRemoteV1/mRemoteV1.csproj | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index faacd6d8a..f45c1b260 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -971,7 +971,6 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-<<<<<<< HEAD
     <Content Include="Resources\Help\Screenshots\CommonProblemsRDP\credssp-error.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1066,9 +1065,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Resources\Help\ui_navigation.htm">
-=======
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Icons\Apple.ico">
->>>>>>> upstream/develop
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="Resources\Icons\FamFamFam\error.ico" />