From 70275a0add09ba4cf23b80ff84a07b62eb23d6ec Mon Sep 17 00:00:00 2001
From: fatalerrors <fatalerrors@geoffray-levasseur.org>
Date: Wed, 6 Oct 2021 10:57:45 +0200
Subject: [PATCH] finish previous merge

---
 lib/services.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/services.sh b/lib/services.sh
index 310e749..4aa9ff4 100644
--- 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