From 85b797bfd2d52b736138889ec13fcc95232aa999 Mon Sep 17 00:00:00 2001
From: zart <zart2007@163.com>
Date: Tue, 16 Apr 2024 16:30:17 +0800
Subject: [PATCH] init

---
 README.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/README.md b/README.md
index 02b1667..ca23e54 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # TSP_v1
 
-<<<<<<< HEAD
 # 说明
 
 
@@ -33,9 +32,3 @@ python main.py
 
 本项目使用 AGPL-3.0-only 许可证。
 
-
-
-    
-
-=======
->>>>>>> origin/main