默认变更列表

4 months ago · 5d2043f2e3
parent 59f59e2137
commit 5d2043f2e3
1 changed files with 0 additions and 3 deletions
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -2,9 +2,6 @@
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-<<<<<<< HEAD
    <mapping directory="$PROJECT_DIR$/gym" vcs="Git" />
-=======
->>>>>>> develop
  </component>
 </project>