Resolve cacert.h merge conflicts

Author: Gioee

src/cacert.h

@@ -1,29 +1,3 @@
-<<<<<<< HEAD:src/android_cert.h
-/*
- ##
- ## Bundle of CA Root Certificates
- ##
- ## Certificate data from Mozilla as of: Tue May 20 03:12:02 2025 GMT
- ##
- ## Find updated versions here: https://curl.se/docs/caextract.html
- ##
- ## This is a bundle of X.509 certificates of public Certificate Authorities
- ## (CA). These were automatically extracted from Mozilla's root certificates
- ## file (certdata.txt).  This file can be found in the mozilla source tree:
- ## https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/release/security/nss/lib/ckfw/builtins/certdata.txt
- ##
- ## It contains the certificates in PEM format and therefore
- ## can be directly used with curl / libcurl / php_curl, or with
- ## an Apache+mod_ssl webserver for SSL client authentication.
- ## Just configure this file as the SSLCACertificateFile.
- ##
- ## Conversion done with mk-ca-bundle.pl version 1.29.
- ## SHA256: 8944ec6b572b577daee4fc681a425881f841ec2660e4cb5f0eee727f84620697
- ##
- */
-
-static const char cacert_pem[] = "\n"
-=======
 static const char cacert_pem[] = "##\n"
 "## Bundle of CA Root Certificates\n"
 "##\n"
@@ -45,7 +19,6 @@ static const char cacert_pem[] = "##\n"
 "## SHA256: 8944ec6b572b577daee4fc681a425881f841ec2660e4cb5f0eee727f84620697\n"
 "##\n"
 "\n"
->>>>>>> main:src/cacert.h
 "\n"
 "Entrust Root Certification Authority\n"
 "====================================\n"
@@ -3504,9 +3477,4 @@ static const char cacert_pem[] = "##\n"
 "S5THaJQXfuKOKD62xur1NGyfN4gHONuGcfrNlUhDbqNPgofXNJhuS5N5YHVpD/Aa1VP6IQzCP+k/\n"
 "HxiMkl14p3ZnGbuy6n/pcAlWVqOwDAstNl7F6cTVg8uGF5csbBNvh1qvSaYd2804BC5f4ko1Di1L\n"
 "+KIkBI3Y4WNeApI02phhXBxvWHZks/wCuPWdCg==\n"
-<<<<<<< HEAD:src/android_cert.h
-"-----END CERTIFICATE-----\n"
-"";
-=======
-"-----END CERTIFICATE-----\n";
->>>>>>> main:src/cacert.h
+"-----END CERTIFICATE-----\n";