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

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