qingfeng 2 years ago
parent
commit
ba7533df51
1 changed files with 0 additions and 3 deletions
  1. 0 3
      .gitignore

+ 0 - 3
.gitignore

@@ -1,8 +1,5 @@
 *.txt
-<<<<<<< HEAD
-=======
 .gitignore
->>>>>>> dev
 ./USER
 /FILES
 /USER