From c109281a96e7c1892eb6926aa10199b8926f94ca Mon Sep 17 00:00:00 2001
From: xiaobaozi-web <864508127@qq.com>
Date: Sun, 23 Feb 2025 11:30:10 +0800
Subject: [PATCH] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 52dcdeb..2642bd4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # 卡码笔记 (Kama Notes)
 
 卡码笔记是一个面向程序员的在线笔记分享和学习平台，旨在为程序员提供一个高效的知识分享和交流空间。