1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

fix php_version

This commit is contained in:
David Carlier
2025-03-12 22:22:20 +00:00
parent 4d6c7bd6e3
commit ccb6d78bab

View File

@@ -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