finish previous merge

This commit is contained in:
2021-10-06 10:57:45 +02:00
parent 9a371e62a9
commit 70275a0add

View File

@@ -29,12 +29,8 @@ exec_serv()
prnt I "Lancement de la commande $command du services $svcname" prnt I "Lancement de la commande $command du services $svcname"
$lineexec $lineexec
<<<<<<< HEAD
unset lineexec
=======
return $? return $?
>>>>>>> 0a2c9f5bc3d32cd765a3c67aa81e060c9ec28426 unset lineexec
} }
export exec_serv export exec_serv