From d3d19a5fd6b8560adc4edd32f7df83da7dcd2196 Mon Sep 17 00:00:00 2001
From: AShifter <loganr.lowe@gmail.com>
Date: Fri, 31 Mar 2017 14:28:34 -0600
Subject: Add AppVeyor Artifacts

honeyfri
---
 TimeHACK.Main/bin/Release/TimeHACK.application | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'TimeHACK.Main/bin/Release/TimeHACK.application')

diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application
index 5636705..851891e 100644
--- a/TimeHACK.Main/bin/Release/TimeHACK.application
+++ b/TimeHACK.Main/bin/Release/TimeHACK.application
@@ -7,22 +7,14 @@
     <framework targetVersion="4.5.2" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-<<<<<<< HEAD
     <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="20452">
-=======
-    <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="25070">
->>>>>>> origin/master
       <assemblyIdentity name="TimeHACK.exe" version="1.0.1.0" publicKeyToken="0000000000000000" language="en" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-<<<<<<< HEAD
-        <dsig:DigestValue>esByQlyDRM46U3W/e6t9cu2R/zGQlSsEzPD2CdhyzAA=</dsig:DigestValue>
-=======
-        <dsig:DigestValue>FLFyLhgh/00187VHfEwpMWCgaYVgEkJOBemU56+LWss=</dsig:DigestValue>
->>>>>>> origin/master
+        <dsig:DigestValue>yDuv9DACEBUcasYM8fow3WsVGTvvjrK93LyFa9KPsEI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
-- 
cgit v1.2.3