From b89947ff7caf55e5b637c0fef78570ce7560dd78 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Thu, 20 Jan 2022 19:58:31 +0100
Subject: [PATCH] Update commande.class.php

---
 htdocs/commande/class/commande.class.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 26a52836744..652e7a72d4a 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -490,11 +490,7 @@ class Commande extends CommonOrder
 		$sql .= " SET ref = '".$this->db->escape($num)."',";
 		$sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
 		$sql .= " date_valid='".$this->db->idate($now)."',";
-<<<<<<< Updated upstream
-		$sql .= " fk_user_valid = ".((int) $user->id)."',";
-=======
 		$sql .= " fk_user_valid = ".((int) $user->id).",";
->>>>>>> Stashed changes
 		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);