From 0c56bfcd982341c85972bf2bf14382036e9abc0b Mon Sep 17 00:00:00 2001
From: levasseur <geoffray.levasseur@obs-mip.fr>
Date: Tue, 21 Sep 2021 17:28:12 +0200
Subject: [PATCH] finallized merge

---
 init.sh                     | 7 -------
 modules/conf_disks.sh       | 4 ----
 modules/install_chromium.sh | 5 -----
 3 files changed, 16 deletions(-)

diff --git a/init.sh b/init.sh
index 9d223de..18330f6 100755
--- a/init.sh
+++ b/init.sh
@@ -36,11 +36,7 @@ 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)
@@ -130,10 +126,7 @@ 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
diff --git a/modules/conf_disks.sh b/modules/conf_disks.sh
index c4cd285..c11f797 100644
--- a/modules/conf_disks.sh
+++ b/modules/conf_disks.sh
@@ -16,11 +16,7 @@
 #  * CALCDRV: Target drives, preferably through ID.
 # ------------------------------------------------------------------------------
 
-<<<<<<< HEAD
 export VER_conf_disks="0.0.9"
-=======
-export VER_conf_disks="0.0.8"
->>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
 export DEP_conf_disks="upgrade_dist"
 
 # ------------------------------------------------------------------------------
diff --git a/modules/install_chromium.sh b/modules/install_chromium.sh
index 55c7870..0060529 100644
--- a/modules/install_chromium.sh
+++ b/modules/install_chromium.sh
@@ -20,12 +20,7 @@ install_chromium()
 {
     # Add Debian Buster repo to sources.list.d directory
     prnt I "Ajout du dépot Debian Buster aux sources logicielles..."
-<<<<<<< HEAD
     installfile debian_buster.list /etc/apt/sources.list.d/
-=======
-    installfile debian_buster.lM3t4ll1c4#l9
-    ist /etc/apt/sources.list.d/
->>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
     
     # Install Debian GPG keys
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DCC9EFBF77E11517