lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new_branch_21_09_2018' of github.com:grandoc/dolibarr into new_branch_21_09_2018

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-21 15:07:44 +02:00
commit 3355004e5d
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/modules/ticket/mod_ticket_universal.php
View File

@ -35,18 +35,9 @@ class mod_ticket_universal extends ModeleNumRefTicket
*/ */
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
<<<<<<< HEAD
<<<<<<< HEAD
/** /**
* @var string Error code (or message) * @var string Error code (or message)
*/ */
=======
>>>>>>> upstream/develop
=======
/**
* @var string Error code (or message)
*/
>>>>>>> d5003c9d3c507b5064a1f8e96a1ae9a019b6a5e9
public $error = ''; public $error = '';
/** /**