Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

not sure if this fixes it

Browse Source 
test
This commit is contained in:
nmat
2018-12-27 22:25:10 +01:00
parent b2d3aa8c11
commit 1bd96f6a88
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mRemoteV1/mRemoteV1.csproj
View File

@@ -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" />