From ccb6d78bab61f06c5ab3ecdaf021aa321fb6675a Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Wed, 12 Mar 2025 22:22:20 +0000
Subject: [PATCH] fix php_version

---
 main/php_version.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/main/php_version.h b/main/php_version.h
index c12a5f83c17..269397ba11e 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -1,16 +1,8 @@
 /* automatically generated by configure */
 /* edit configure.ac to change version number */
 #define PHP_MAJOR_VERSION 8
-<<<<<<< HEAD
 #define PHP_MINOR_VERSION 5
 #define PHP_RELEASE_VERSION 0
 #define PHP_EXTRA_VERSION "-dev"
 #define PHP_VERSION "8.5.0-dev"
 #define PHP_VERSION_ID 80500
-=======
-#define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 6
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "8.4.6-dev"
-#define PHP_VERSION_ID 80406
->>>>>>> PHP-8.4