fix merging

htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php

@@ -46,9 +46,9 @@ class doc_generic_order_odt extends ModelePDFCommandes
 	public $emetteur;
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+   * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
+   */
 	public $phpmin = array(5, 4);
 
 	/**

htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php

@@ -44,9 +44,9 @@ class doc_generic_contract_odt extends ModelePDFContract
 	public $emetteur;
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+   * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
+   */
 	public $phpmin = array(5, 4);
 
 	/**

htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php

@@ -47,9 +47,9 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 	public $emetteur;
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+   * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
+   */
 	public $phpmin = array(5, 4);
 
 	/**

htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php

@@ -45,9 +45,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 	public $emetteur;	// Objet societe qui emet
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+   * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
+   */
 	public $phpmin = array(5, 4);
 
 	/**

htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php

@@ -43,9 +43,9 @@ class doc_generic_product_odt extends ModelePDFProduct
 	public $emetteur;
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+   * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
+   */
 	public $phpmin = array(5, 4);
 
 	/**

htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php

@@ -61,9 +61,9 @@ class doc_generic_task_odt extends ModelePDFTask
 	public $emetteur;	// Objet societe qui emet
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+   * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
+   */
 	public $phpmin = array(5, 4);
 
 	/**

htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php

@@ -44,9 +44,9 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 	public $emetteur;	// Objet societe qui emet
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+   * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
+   */
 	public $phpmin = array(5, 4);
 
 	/**

htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php

@@ -43,9 +43,9 @@ class doc_generic_stock_odt extends ModelePDFStock
 	public $emetteur;
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+   * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
+   */
 	public $phpmin = array(5, 4);
 
 	/**

htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php

@@ -44,9 +44,9 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 	public $emetteur;
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+   * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
+   */
 	public $phpmin = array(5, 4);
 
 	/**

htdocs/core/modules/ticket/mod_ticket_universal.php

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

htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php

@@ -42,9 +42,9 @@ class doc_generic_user_odt extends ModelePDFUser
 	public $emetteur;
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+   * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
+   */
 	public $phpmin = array(5, 4);
 
 	/**

htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php

@@ -44,9 +44,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 	public $emetteur;
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+   * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
+   */
 	public $phpmin = array(5, 4);
 
 	/**