From 04044df36aaee4f0900d02c07d5787b7f456aeed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2017 01:23:21 +0100
Subject: [PATCH] Fix merge

---
 htdocs/expensereport/class/api_expensereports.class.php | 2 +-
 htdocs/expensereport/class/expensereport.class.php      | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 94d41e432f3..03ecb51de79 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -396,7 +396,7 @@ class ExpenseReports extends DolibarrApi
             $this->expensereport->$field = $value;
         }
         
-        if($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
+        if($this->expensereport->update(DolibarrApiAccess::$user))
             return $this->get($id);
         
         return false;
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 417aa4a370d..f1c5978a8be 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -324,18 +324,11 @@ class ExpenseReport extends CommonObject
      * update
      *
      * @param   User    $user       User making change
-<<<<<<< HEAD
 	 * @param   int     $notrigger  Disable triggers
-=======
      * @param   User    $newuser    New user we want to have the expense report on.
->>>>>>> branch '5.0' of git@github.com:Dolibarr/dolibarr.git
      * @return  int                 <0 if KO, >0 if OK
      */
-<<<<<<< HEAD
-    function update($user, $notrigger = 0)
-=======
-    function update($user, $userofexpensereport=null)
->>>>>>> branch '5.0' of git@github.com:Dolibarr/dolibarr.git
+    function update($user, $notrigger = 0, $userofexpensereport=null)
     {
         global $langs;