Merge branch 'master' of ssh://apo.geoffray-levasseur.org/share/services/git/legos

2021-10-18 16:40:21 +02:00
parent 53c546fe20 4cfa6561d6
commit 70e597baa4
11 changed files with 33 additions and 29 deletions
--- a/lib/zzz_main_fct.sh
+++ b/lib/zzz_main_fct.sh
@@ -24,8 +24,12 @@ read_commandline()
    local want_module=false
    local want_logfile=false
    local want_conffile=false
+<<<<<<< HEAD
    local want_conffile=false
    
+=======
+
+>>>>>>> 4cfa6561d648917e254a858a5d38cf4d4a90267e
    local opt=
    for opt in $@; do
        case $opt in