解决合并冲突

Author: jingjingxyk

README.md

@@ -8,7 +8,6 @@
 
 > 本项目 派生于 [swoole-cli](https://github.com/swoole/swoole-cli/)
 
-
 > 代码与 swoole-cli 项目的 build_native_php 分支的代码 保持一致
 
 > 构建流程 与 swoole-cli 构建流程一致

sapi/scripts/download-php-src-archive.php

@@ -1,24 +1,15 @@
 <?php
 
-<<<<<<< HEAD
-
 $project_dir = realpath(__DIR__ . '/../../');
 $php_version_tag = trim(file_get_contents($project_dir . '/sapi/PHP-VERSION.conf'));
 # $php_version_tag = '8.2.29';
-=======
-$project_dir = realpath(__DIR__ . '/../../');
-$php_version_tag = trim(file_get_contents($project_dir . '/sapi/PHP-VERSION.conf'));
->>>>>>> experiment-feature
 $php_source_folder = $project_dir . "/var/php-{$php_version_tag}";
 $php_archive_file = $project_dir . "/pool/php-tar/php-{$php_version_tag}.tar.gz";
 // github.com
 $php_archive_file_sha256sum = '22bd132176a2ff5140dd38d30213364ce1119edda4521280d5249bc1f55721e9';
 // php.net
 // $php_archive_file_sha256sum = '40341f3e03a36d48facdb6cc2ec600ff887a1af9a5e5fee0b40f40b61488afae';
-<<<<<<< HEAD
 
-=======
->>>>>>> experiment-feature
 $download_dir = dirname($php_archive_file);
 $download_php_counter = 0;