From 02ad08035e9c290ff9327fcb3a6e4eef9e91d44b Mon Sep 17 00:00:00 2001
From: Mike Reeves <reevesmk@gmail.com>
Date: Mon, 31 Mar 2025 11:36:55 -0400
Subject: [PATCH] Resolve Conflicts

---
 salt/manager/tools/sbin/soup | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index e8f66168b..07ae96a99 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -564,15 +564,14 @@ post_to_2.4.140() {
   POSTVERSION=2.4.140
 }
 
-<<<<<<< HEAD
-post_to_2.4.150() {
-  echo "Nothing to apply"
-  POSTVERSION=2.4.150
-=======
 post_to_2.4.141() {
   echo "Nothing to apply"
   POSTVERSION=2.4.141
->>>>>>> 2.4/main
+}
+
+post_to_2.4.150() {
+  echo "Nothing to apply"
+  POSTVERSION=2.4.150
 }
 
 repo_sync() {
@@ -801,17 +800,15 @@ up_to_2.4.140() {
   INSTALLEDVERSION=2.4.140
 }
 
-<<<<<<< HEAD
-up_to_2.4.150() {
-  echo "Nothing to do for 2.4.150"
-
-  INSTALLEDVERSION=2.4.150
-=======
 up_to_2.4.141() {
   echo "Nothing to do for 2.4.141"
 
   INSTALLEDVERSION=2.4.141
->>>>>>> 2.4/main
+
+up_to_2.4.150() {
+  echo "Nothing to do for 2.4.150"
+
+  INSTALLEDVERSION=2.4.150
 }
 
 add_hydra_pillars() {