From 77ba0b398f04a248f551a4f94b2cb745807d68af Mon Sep 17 00:00:00 2001
From: jf-cbd <jimmy.fayolle@combodo.com>
Date: Thu, 6 Mar 2025 12:11:20 +0100
Subject: [PATCH] Fix merge conflict

---
 core/restservices.class.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/restservices.class.inc.php b/core/restservices.class.inc.php
index ac43d8e7f..812b18a1c 100644
--- a/core/restservices.class.inc.php
+++ b/core/restservices.class.inc.php
@@ -46,7 +46,6 @@ class ObjectResult
 	 */
     use SanitizeTrait;
 
-    public $code;
 	public $message;
 	/**
 	 * @var mixed|null