diff options
| author | Alwin1847207 | 2019-11-04 17:03:10 +0530 |
|---|---|---|
| committer | Alwin1847207 | 2019-11-04 17:03:10 +0530 |
| commit | 7c650b158109a9d59882365d26f0327390268f13 (patch) | |
| tree | 1140bf6b65c75b9b175adb08d9206104f60104a5 /.idea/vcs.xml | |
| parent | 9a63fcaff0974fa6401d48c5dae53782f50c4ddc (diff) | |
| parent | cfdc41deed280bddbcc6c3cf45e30f33ea139e88 (diff) | |
| download | FOSSEE_animations-7c650b158109a9d59882365d26f0327390268f13.tar.gz FOSSEE_animations-7c650b158109a9d59882365d26f0327390268f13.tar.bz2 FOSSEE_animations-7c650b158109a9d59882365d26f0327390268f13.zip | |
removed merge conflicts
Diffstat (limited to '.idea/vcs.xml')
| -rw-r--r-- | .idea/vcs.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="$PROJECT_DIR$" vcs="Git" /> + </component> +</project>
\ No newline at end of file |