From ca9d46fea66dd3a0878fb11469156ab1c57c0fb0 Mon Sep 17 00:00:00 2001
From: Alex-TIMEHACK <alexbu2015@hotmail.com>
Date: Sat, 20 May 2017 09:44:06 +0100
Subject: Fixed Conflicts PART 2

---
 TimeHACK.Main/TimeHACK.Main.csproj | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'TimeHACK.Main/TimeHACK.Main.csproj')

diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index 07cc0a4..4956405 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -101,6 +101,9 @@
     <AssemblyOriginatorKeyFile>
     </AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <NoWin32Manifest>true</NoWin32Manifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-- 
cgit v1.2.3