Resolve merge conflict in README.md

StackAndPointer · StackAndPointer · commit 1a297cd9611c · 2026-03-21T17:36:30.000+08:00
diff --git a/README.md b/README.md
@@ -99,4 +99,12 @@ This project is open source.
 - C++/Win32 API
 - Visual Studio 2022
 - DIA SDK (Debug Interface Access)
+<<<<<<< HEAD
 - RichEdit control
+=======
+- RichEdit 控件
+
+## 联系方式
+
+
+>>>>>>> 013680e50c06d2b222125a07491cbe87332f972a
