From ad7fd04f1973aa9fe5a4d2398b4a1a77fad91c08 Mon Sep 17 00:00:00 2001
From: CakeCN <cakebaker.0308@gmail.com>
Date: Thu, 11 Dec 2025 14:19:14 +0800
Subject: [PATCH] add .gitattributes

---
 Html/.gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Html/.gitattributes

diff --git a/Html/.gitattributes b/Html/.gitattributes
new file mode 100644
index 0000000..4bbccce
--- /dev/null
+++ b/Html/.gitattributes
@@ -0,0 +1 @@
+Html/config.ini merge=ours
\ No newline at end of file