fatal
This commit is contained in:
commit
0fbfd2c18d
17 changed files with 839 additions and 0 deletions
4
.idea/vcs.xml
generated
4
.idea/vcs.xml
generated
|
|
@ -1,6 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<<<<<<< HEAD
|
||||
<mapping directory="" vcs="Git" />
|
||||
=======
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
>>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11
|
||||
</component>
|
||||
</project>
|
||||
Loading…
Add table
Add a link
Reference in a new issue