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

fix merging

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-21 14:09:12 +02:00
commit de6fca0844
12 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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