From 0f5937dd12acdab1902788cddf66e2534c052f26 Mon Sep 17 00:00:00 2001
From: szdotServer <szddot@qq.comm>
Date: Thu, 8 May 2025 19:40:30 +0700
Subject: [PATCH 1/2] teset

---
 .htaccess | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index 77ecc56..e69de29 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,2 +0,0 @@
-<IfModule mod_headers.c>
-</IfModule>
\ No newline at end of file

From ce7af147c97c45d943297dadb42c68aaf8d03d55 Mon Sep 17 00:00:00 2001
From: szdotServer <szddot@qq.comm>
Date: Thu, 8 May 2025 19:57:49 +0700
Subject: [PATCH 2/2] test

---
 .htaccess | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.htaccess b/.htaccess
index df8722a..1511ab4 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 <IfModule mod_headers.c>
 	Header set Access-Control-Allow-Origin "*"
 	Header set Access-Control-Allow-Methods "GET, POST, OPTIONS"
 	Header set Access-Control-Allow-Headers "Content-Type, Authorization"
 </IfModule>
->>>>>>> 0cee3014507ab00f356db97502f8a1de7a5a6757