summaryrefslogtreecommitdiffstats
path: root/916.patch
diff options
context:
space:
mode:
Diffstat (limited to '916.patch')
-rw-r--r--916.patch23
1 files changed, 0 insertions, 23 deletions
diff --git a/916.patch b/916.patch
deleted file mode 100644
index ef61153..0000000
--- a/916.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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