code cleanup

updated installer
reignstudios · Apr 15, 2017 · 15d4799 · 15d4799
1 parent 7f372bf
commit 15d4799
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/GitItGUI.Core/ChangesManager.cs b/GitItGUI.Core/ChangesManager.cs
@@ -637,14 +637,10 @@ public static bool ResolveConflict(FileState fileState, bool refresh)
 						case MergeBinaryFileResults.KeepMine:
 							File.Copy(fullPathOurs, fullPathBase, true);
 							break;
-							//if (!Repository.AcceptConflictedFile(fileState.filename, FileConflictSources.Ours)) throw new Exception(Repository.lastError);
-							//goto FINISH;
 
 						case MergeBinaryFileResults.UseTheirs:
 							File.Copy(fullPathTheirs, fullPathBase, true);
 							break;
-							//if (!Repository.AcceptConflictedFile(fileState.filename, FileConflictSources.Theirs)) throw new Exception(Repository.lastError);
-							//goto FINISH;
 
 						case MergeBinaryFileResults.RunMergeTool:
 							using (var process = new Process())

diff --git a/Installer/Git-It-GUI_Installer.aip b/Installer/Git-It-GUI_Installer.aip
@@ -13,10 +13,10 @@
     <ROW Property="ARPURLUPDATEINFO" Value="https://github.com/reignstudios/Git-It-GUI/releases"/>
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="Manufacturer" Value="Reign-Studios"/>
-    <ROW Property="ProductCode" Value="1033:{53341127-1E04-45F2-BBD7-275EE314E5AB} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{A3FD9CA4-6F37-44DD-B729-86C75921AE79} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Git-It-GUI"/>
-    <ROW Property="ProductVersion" Value="0.2.11" Type="32"/>
+    <ROW Property="ProductVersion" Value="0.2.12" Type="32"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{FD4A5E78-F668-42CE-90BC-D1DDAA792189}"/>