init

1 year ago · ed16255f7a
parent 6a6cf160ab d501c8cc8b
commit ed16255f7a
6 changed files with 6 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,8 +2,10 @@
 ### Example user template

 # IntelliJ project files
-.idea
+.idea/
 *.iml
 out
 gen

+__pycache__/
+
--- a/README.md
+++ b/README.md
@ -1,5 +1,6 @@
 # TSP_v1

+<<<<<<< HEAD
 # 说明


@ -36,3 +37,5 @@ python main.py

    

+=======
+>>>>>>> origin/main
--- a/pycache/get_real_data.cpython-310.pyc
+++ b/pycache/get_real_data.cpython-310.pyc
--- a/pycache/tsp_canvas.cpython-310.pyc
+++ b/pycache/tsp_canvas.cpython-310.pyc
--- a/pycache/tsp_data.cpython-310.pyc
+++ b/pycache/tsp_data.cpython-310.pyc
--- a/pycache/tsp_ui.cpython-310.pyc
+++ b/pycache/tsp_ui.cpython-310.pyc