diff options
| author | AShifter <[email protected]> | 2017-03-31 14:19:58 -0600 |
|---|---|---|
| committer | AShifter <[email protected]> | 2017-03-31 14:19:58 -0600 |
| commit | 1e25868f0fb574d2b0f7e990b962a2d7b5efa9dd (patch) | |
| tree | fdd4df902301fb44dbcfa2fbf91a6a1dd2893907 /TimeHACK.Main/bin/Release/TimeHACK.application | |
| parent | 82557462d1bb0a7fb776692cd0887b00919999d8 (diff) | |
| parent | a1e832d8869f036f1428a2ea75456360101d17a3 (diff) | |
| download | histacom2-1e25868f0fb574d2b0f7e990b962a2d7b5efa9dd.tar.gz histacom2-1e25868f0fb574d2b0f7e990b962a2d7b5efa9dd.tar.bz2 histacom2-1e25868f0fb574d2b0f7e990b962a2d7b5efa9dd.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
# TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt
# TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
# TimeHACK.Main/bin/Release/TimeHACK.application
# TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache
# TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
# TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache
# TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
# TimeHACK.Main/obj/Release/TimeHACK.application
Diffstat (limited to 'TimeHACK.Main/bin/Release/TimeHACK.application')
| -rw-r--r-- | TimeHACK.Main/bin/Release/TimeHACK.application | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 82e01bf..5636705 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -7,14 +7,22 @@ <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 </hash> </dependentAssembly> </dependency> |