Fix some errors that were made during commit

Blade-OS · Dec 30, 2023 · e603691 · e603691
1 parent c9c0143
commit e603691
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/hooks/9095-setup-os.chroot b/hooks/9095-setup-os.chroot
@@ -21,7 +21,6 @@ set -e
 	sed -i -e 's|^ *Icon=install-debian|Icon=/usr/share/icons/BladeNoText.svg|' /usr/share/applications/calamares-install-debian.desktop
 
 # Remove un-needed packages
-<<<<<<< HEAD
 	/usr/bin/apt purge -y systemsettings firefox-esr
 	/usr/bin/apt autoremove -y
 
@@ -30,7 +29,3 @@ set -e
 	flatpak install org.libreoffice.LibreOffice -y
 	flatpak install io.github.amit9838.weather -y
 	flatpak install org.gnome.Geary -y
-=======
-	/usr/bin/apt purge -y systemsettings
-	/usr/bin/apt autoremove -y
->>>>>>> 441951d7f1956e7b6768afdfad5e7f8228b9f38a