From be08e6691b7b5b6e529e1e2af99757c8c4762655 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sun, 22 Oct 2023 09:12:16 +0200
Subject: fix configuration file using patch from

  https://github.com/xdebug/xdebug/pull/916
---
 916.patch | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 916.patch

(limited to '916.patch')

diff --git a/916.patch b/916.patch
new file mode 100644
index 0000000..ef61153
--- /dev/null
+++ b/916.patch
@@ -0,0 +1,23 @@
+From d9a61214ca40418dba961858029dc00e79977056 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Sun, 22 Oct 2023 08:55:38 +0200
+Subject: [PATCH] Update xdebug.ini
+
+---
+ xdebug.ini | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/xdebug.ini b/xdebug.ini
+index c983bef23..9d091b4c7 100644
+--- a/xdebug.ini
++++ b/xdebug.ini
+@@ -1,9 +1,5 @@
+ ; This file is generated by the 'xdebug.org:html/docs/convert.php' robot
+-<<<<<<< Updated upstream
+-; for Xdebug 3.3.0alpha2 — do not modify by hand
+-=======
+ ; for Xdebug 3.3.0alpha3 — do not modify by hand
+->>>>>>> Stashed changes
+ 
+ ; -----------------------------------------------------------------------------
+ ; xdebug.cli_color
-- 
cgit