Remove borked/remaining conflicts

ZEISS · Nov 22, 2023 · e4455f1 · e4455f1
1 parent ca9b16d
commit e4455f1
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 28 deletions.
diff --git a/czishrink/netczicompress.Installer/CziShrinkMSI/CziShrinkDesktopShortcut.wxs b/czishrink/netczicompress.Installer/CziShrinkMSI/CziShrinkDesktopShortcut.wxs
@@ -2,7 +2,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?include CziShrinkVariables.wxi ?>
   <Fragment>
-<<<<<<< HEAD
     <Component Id="CziShrinkDesktopShortcut" Directory="DesktopFolder" Condition="WIXUI_ADDDESKTOPSHORTCUT = 1">
       <RegistryValue Root="HKCU"
                      Key="$(RegistryKeyPath)"
@@ -13,25 +12,6 @@
                 Target="[#CziShrinkEXE]"
                 Directory="DesktopFolder"
                 Icon="CziShrinkIcon" />
-
-=======
-    <Component Id="CziShrinkDesktopShortcut" Directory="INSTALLFOLDER" Condition="WIXUI_ADDDESKTOPSHORTCUT=1">
-      <Shortcut Id="DesktopShortcut"
-                Name="$(var.ShortcutName)"
-                Description="$(var.ShortcutDesc)"
-                Target="[!CziShrinkEXE]"
-                Directory="DesktopFolder"
-                WorkingDirectory="INSTALLFOLDER" />
-      <RemoveFolder Id="CleanupDesktopShortcut"
-                    Directory="DesktopFolder"
-                    On="uninstall" />
-      <RegistryValue Root="HKCU"
-                     Key="$(RegistryKeyPath)"
-                     Name="DesktopShortcutInstalled"
-                     Type="integer"
-                     Value="1"
-                     KeyPath="yes" />
->>>>>>> a328abd (Move installer into czishrink subdirectory)
     </Component>
   </Fragment>
 </Wix>
diff --git a/czishrink/netczicompress.Installer/CziShrinkMSI/CziShrinkMSI.wixproj b/czishrink/netczicompress.Installer/CziShrinkMSI/CziShrinkMSI.wixproj
@@ -4,12 +4,8 @@
       $(DefineConstants);
       CustomImg=$(MSBuildProjectDirectory)\Custom UI\Images;
     </DefineConstants>
-<<<<<<< HEAD
     <SuppressIces>ICE64;ICE69</SuppressIces>
     <OutputName>CZI Shrink Installer</OutputName>
-=======
-    <SuppressIces>ICE64</SuppressIces>
->>>>>>> a328abd (Move installer into czishrink subdirectory)
   </PropertyGroup>
   <ItemGroup>
     <Content Include="CziShrinkVariables.wxi" />

diff --git a/czishrink/netczicompress.Installer/CziShrinkMSI/Package.wxs b/czishrink/netczicompress.Installer/CziShrinkMSI/Package.wxs
@@ -21,11 +21,7 @@
          -->
     <WixVariable Id="WixUIArtifactsRtf" Value="artifactdistribution.rtf" />
     <WixVariable Id="LicenseAgreementDlgBannerBitmap" Value="$(var.CustomImg)\LicenseBanner.bmp" />
-<<<<<<< HEAD
     <WixVariable Id="WixUIDialogBmp" Value="$(var.CustomImg)\DefaultBackground.png" />
-=======
-    <WixVariable Id="WixUIDialogBmp" Value="$(var.CustomImg)\DefaultBackground.bmp" />
->>>>>>> a328abd (Move installer into czishrink subdirectory)
     <WixVariable Id="WixUIBannerBmp" Value="$(var.CustomImg)\DefaultBanner.png" />
 
     <!-- Level and Title are not strictly needed here but give a hint for how installer could leverage features to install something like czicheck or add