|
|
|
@ -2,9 +2,6 @@
|
|
|
|
<project version="4">
|
|
|
|
<project version="4">
|
|
|
|
<component name="VcsDirectoryMappings">
|
|
|
|
<component name="VcsDirectoryMappings">
|
|
|
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
|
|
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
<mapping directory="$PROJECT_DIR$/gym" vcs="Git" />
|
|
|
|
<mapping directory="$PROJECT_DIR$/gym" vcs="Git" />
|
|
|
|
=======
|
|
|
|
|
|
|
|
>>>>>>> develop
|
|
|
|
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
</project>
|
|
|
|
</project>
|
