From 10fbea5f4d4c30dac179d2eec586bfa6d873b8a2 Mon Sep 17 00:00:00 2001
From: jf-cbd <jimmy.fayolle@combodo.com>
Date: Mon, 24 Mar 2025 10:09:33 +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 0a108a77b..88d563d81 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