CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve Conflicts

Browse Source
This commit is contained in:
Mike Reeves
2025-03-31 11:36:55 -04:00
parent 335d8851e6
commit 02ad08035e
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
salt/manager/tools/sbin/soup
View File

@@ -564,15 +564,14 @@ post_to_2.4.140() {
POSTVERSION=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() { post_to_2.4.141() {
echo "Nothing to apply" echo "Nothing to apply"
POSTVERSION=2.4.141 POSTVERSION=2.4.141
>>>>>>> 2.4/main }
post_to_2.4.150() {
echo "Nothing to apply"
POSTVERSION=2.4.150
} }
repo_sync() { repo_sync() {
@@ -801,17 +800,15 @@ up_to_2.4.140() {
INSTALLEDVERSION=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() { up_to_2.4.141() {
echo "Nothing to do for 2.4.141" echo "Nothing to do for 2.4.141"
INSTALLEDVERSION=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() { add_hydra_pillars() {