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

init.sh

@@ -36,7 +36,11 @@ export LC_ALL=C
 export LANG=C
 
 # Version of init
+<<<<<<< HEAD
 export VERSION="0.99.7"
+=======
+export VERSION="0.99.6"
+>>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
 
 # Store script's path
 export MYPATH=$(dirname $0)
@@ -126,7 +130,10 @@ for mod in $MODULE_LIST; do
 done
 
 if [[ $RUN_SHELL == true ]]; then
+<<<<<<< HEAD
     prnt I "Lancement d'un shell intéractif..."
+=======
+>>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
     bash --noprofile --rcfile $MYPATH/bash.rc
     prnt I "Sortie du script après exécution du shell."
     exit 0