aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Main/bin/Release/TimeHACK.application
diff options
context:
space:
mode:
authorAShifter <[email protected]>2017-03-31 14:28:34 -0600
committerAShifter <[email protected]>2017-03-31 14:28:34 -0600
commitd3d19a5fd6b8560adc4edd32f7df83da7dcd2196 (patch)
tree01ae44cb0d7e5b85f351841f9833cdb08e924f53 /TimeHACK.Main/bin/Release/TimeHACK.application
parent1e25868f0fb574d2b0f7e990b962a2d7b5efa9dd (diff)
downloadhistacom2-d3d19a5fd6b8560adc4edd32f7df83da7dcd2196.tar.gz
histacom2-d3d19a5fd6b8560adc4edd32f7df83da7dcd2196.tar.bz2
histacom2-d3d19a5fd6b8560adc4edd32f7df83da7dcd2196.zip
Add AppVeyor Artifacts
honeyfri
Diffstat (limited to 'TimeHACK.Main/bin/Release/TimeHACK.application')
-rw-r--r--TimeHACK.Main/bin/Release/TimeHACK.application10
1 files changed, 1 insertions, 9 deletions
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>