finallized merge

2021-09-21 17:28:12 +02:00
parent 477f129a6b
commit 0c56bfcd98
3 changed files with 0 additions and 16 deletions
--- 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