Fix phpcs

2018-03-11 19:32:28 +01:00 · 2018-03-11 19:32:28 +01:00 · 43ac1adbc4
commit 43ac1adbc4
parent 6709b0934b
1 changed files with 3 additions and 7 deletions
--- a/htdocs/ticketsup/class/actions_ticketsup.class.php
+++ b/htdocs/ticketsup/class/actions_ticketsup.class.php
@ -976,14 +976,10 @@ class ActionsTicketsup
    }

    /**
-     * print statut
-<<<<<<< HEAD
+     * Print statut
     *
-     * @param		int		$mode		Mode
-=======
-     * @param int $mode Display mode
->>>>>>> branch 'develop' of git@github.com:Dolibarr/dolibarr.git
-     * @return void
+     * @param		int		$mode		Display mode
+     * @return 		void
     */
    public function getLibStatut($mode = 0)
    {