finish previous merge

2021-10-06 10:57:45 +02:00
parent 9a371e62a9
commit 70275a0add
1 changed files with 1 additions and 5 deletions
--- a/lib/services.sh
+++ b/lib/services.sh
@@ -29,12 +29,8 @@ exec_serv()

    prnt I "Lancement de la commande $command du services $svcname"
    $lineexec
-<<<<<<< HEAD
-
-    unset lineexec
-=======
    return $?
->>>>>>> 0a2c9f5bc3d32cd765a3c67aa81e060c9ec28426
+    unset lineexec
 }
 export exec_serv