From 113d963fa22ffe5328676a8f8020492477ad76c3 Mon Sep 17 00:00:00 2001
From: Alex-TIMEHACK <alexbu2015@hotmail.com>
Date: Sat, 6 May 2017 18:02:36 +0100
Subject: Fixed conflicts

---
 TimeHACK.Main/obj/Release/TimeHACK.application | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.application

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

diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application
deleted file mode 100644
index f950128..0000000
--- a/TimeHACK.Main/obj/Release/TimeHACK.application
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="TimeHACK.application" version="1.0.1.0" publicKeyToken="0000000000000000" language="en" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="HistacomCS Development Team" asmv2:product="HistacomCS" asmv2:supportUrl="http://www.ashifter.ml/histacom/forum" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <deployment install="true" mapFileExtensions="true" co.v1:createDesktopShortcut="true" />
-  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
-    <framework targetVersion="4.5.2" profile="Full" supportedRuntime="4.0.30319" />
-  </compatibleFrameworks>
-  <dependency>
-    <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="22480">
-      <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" />
-        <dsig:DigestValue>xjHHFGhzyw8t/woi94tXsDi0wHI6NNfYQtZ7SVesCss=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-</asmv1:assembly>
\ No newline at end of file
-- 
cgit v1.2.3