finish previous merge
This commit is contained in:
@@ -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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user