Fixed some merge issues

2025-12-15 04:57:32 +01:00 · 2022-05-05 08:52:09 +02:00
parent 0f1f2a2feb
commit f159ea8c3c
3 changed files with 11 additions and 23 deletions
--- a/lib/setup-bridgehead-units.sh
+++ b/lib/setup-bridgehead-units.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
-### Note: Currently not complete, needs some features before useable for production

 source lib/functions.sh

-<<<<<<< HEAD
 exitIfNotRoot

 if [ $# -eq 0 ]; then
@@ -18,8 +16,6 @@ fi

 export project=$1

-=======
->>>>>>> 290fe5459d7399ff23a2a8db067c1728858350d5
 if ! ./lib/prerequisites.sh; then
    log "Prerequisites failed, exiting"
    exit 1