From 5b93cb7ababe92729a2c95b8b6d0af6956d8ff77 Mon Sep 17 00:00:00 2001
From: Liam Waldron <liamwaldron@everestlinux.org>
Date: Wed, 1 Feb 2023 16:39:28 -0500
Subject: [PATCH] merge conflict moment

---
 src/glacier | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/glacier b/src/glacier
index 95eea79..3b7af26 100755
--- a/src/glacier
+++ b/src/glacier
@@ -34,12 +34,15 @@
 
 get_pkg() {
 	printf "$blue[ i ]$reset Downloading archive for package '$2'...\n"
+<<<<<<< HEAD
 <<<<<<< HEAD
 		for r in ${ALLOWED_REPOS[@]}; do
 			$GLACIER_DOWNLOAD_BACKEND $GREPO/${r}/$2.tar.gz
 		done
 		find $2.tar.gz
 =======
+=======
+>>>>>>> main
 		# Extremely ugly but does what it needs to do
 		$GLACIER_DOWNLOAD_BACKEND $GREPO1/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO2/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO3/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO4/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO5/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO6/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO7/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO8/$2.tar.gz
 >>>>>>> main
@@ -47,6 +50,7 @@ get_pkg() {
 				printf "$red[ $error ]$reset Package '$2' not found.\n"
 				exit 1
 			fi
+<<<<<<< HEAD
 <<<<<<< HEAD
 
 	printf "$blue[ i ]$reset Downloading checksum for package '$2'...\n"
@@ -55,6 +59,8 @@ get_pkg() {
 		done
 		find $2.checksum
 =======
+=======
+>>>>>>> main
 		# same goes for this
 		$GLACIER_DOWNLOAD_BACKEND $GREPO1/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO2/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO3/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO4/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO5/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO6/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO7/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO8/$2.tar.gz
 >>>>>>> main
@@ -158,8 +164,12 @@ clear_cache() {
 #
 
 debug_info() {
+<<<<<<< HEAD
 <<<<<<< HEAD
 	printf "$blue>> Glacier v3.3.0$reset\n"
+=======
+	printf "$blue>> Glacier v3.2.2$reset\n"
+>>>>>>> main
 =======
 	printf "$blue>> Glacier v3.2.2$reset\n"
 >>>>>>> main
@@ -295,8 +305,12 @@ case $1 in
 		exit 0
 	;;
 	-v|--version)
+<<<<<<< HEAD
 <<<<<<< HEAD
 		printf "${blue}Glacier v3.3.0${reset}\n"
+=======
+		printf "${blue}Glacier v3.2.2${reset}\n"
+>>>>>>> main
 =======
 		printf "${blue}Glacier v3.2.2${reset}\n"
 >>>>>>> main