fixed last merge

2021-10-22 16:15:58 +02:00
parent 395aaede7d
commit 2693a3cc72
1 changed files with 1 additions and 6 deletions
--- a/lib/zzz_main_fct.sh
+++ b/lib/zzz_main_fct.sh
@@ -24,12 +24,7 @@ read_commandline()
    local want_module=false
    local want_logfile=false
    local want_conffile=false
-<<<<<<< HEAD
-    local want_conffile=false
-    
-=======
-
->>>>>>> 4cfa6561d648917e254a858a5d38cf4d4a90267e
+    local want_chroot=false
    local opt=
    for opt in $@; do
        case $opt in