From 41c633b751ed92e01c11243da1d7de6a65f61e54 Mon Sep 17 00:00:00 2001
From: Samuel Vermeulen <samuel@vermeulen.pro>
Date: Tue, 22 Nov 2022 00:56:35 +0100
Subject: [PATCH] fix

---
 config/binary    | 12 ------------
 config/bootstrap | 25 -------------------------
 2 files changed, 37 deletions(-)

diff --git a/config/binary b/config/binary
index 66a7ad8..e025229 100644
--- a/config/binary
+++ b/config/binary
@@ -41,11 +41,7 @@ LB_BUILD_WITH_CHROOT="true"
 LB_DEBIAN_INSTALLER="live"
 
 # Set debian-installer suite
-<<<<<<< HEAD
-LB_DEBIAN_INSTALLER_DISTRIBUTION="buster"
-=======
 LB_DEBIAN_INSTALLER_DISTRIBUTION="bullseye"
->>>>>>> test
 
 # Set debian-installer preseed filename/url
 LB_DEBIAN_INSTALLER_PRESEEDFILE=""
@@ -63,11 +59,7 @@ LB_HDD_SIZE="auto"
 LB_HDD_PARTITION_START=""
 
 # Set iso author
-<<<<<<< HEAD
-LB_ISO_APPLICATION="SVPRO_GNU"
-=======
 LB_ISO_APPLICATION="SVPROGNU-11"
->>>>>>> test
 
 # Set iso preparer
 LB_ISO_PREPARER="live-build @LB_VERSION@; https://salsa.debian.org/live-team/live-build"
@@ -76,11 +68,7 @@ LB_ISO_PREPARER="live-build @LB_VERSION@; https://salsa.debian.org/live-team/liv
 LB_ISO_PUBLISHER="Debian Live project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org"
 
 # Set iso volume (max 32 chars)
-<<<<<<< HEAD
-LB_ISO_VOLUME="SVPRO_GNU"
-=======
 LB_ISO_VOLUME="SVPROGNU-11"
->>>>>>> test
 
 # Set jffs2 eraseblock size
 LB_JFFS2_ERASEBLOCK=""
diff --git a/config/bootstrap b/config/bootstrap
index a7d8972..9a76243 100644
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -2,30 +2,6 @@
 
 # Select architecture to use
 LB_ARCHITECTURE="amd64"
-<<<<<<< HEAD
-
-# Select distribution to use
-LB_DISTRIBUTION="buster"
-
-# Select parent distribution to use
-LB_PARENT_DISTRIBUTION=""
-
-# Select distribution to use in the chroot
-LB_DISTRIBUTION_CHROOT="buster"
-
-# Select parent distribution to use in the chroot
-LB_PARENT_DISTRIBUTION_CHROOT="buster"
-
-# Select distribution to use in the final image
-LB_DISTRIBUTION_BINARY="buster"
-
-# Select parent distribution to use in the final image
-LB_PARENT_DISTRIBUTION_BINARY="buster"
-
-# Select parent distribution for debian-installer to use
-LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="buster"
-
-=======
 
 # Select distribution to use
 LB_DISTRIBUTION="bullseye"
@@ -48,7 +24,6 @@ LB_PARENT_DISTRIBUTION_BINARY="bullseye"
 # Select parent distribution for debian-installer to use
 LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="bullseye"
 
->>>>>>> test
 # Select archive areas to use
 LB_ARCHIVE_AREAS="main contrib non-free"