summaryrefslogtreecommitdiff
path: root/.idea/modules.xml
diff options
context:
space:
mode:
authorAlwin18472072019-11-04 17:03:10 +0530
committerAlwin18472072019-11-04 17:03:10 +0530
commit7c650b158109a9d59882365d26f0327390268f13 (patch)
tree1140bf6b65c75b9b175adb08d9206104f60104a5 /.idea/modules.xml
parent9a63fcaff0974fa6401d48c5dae53782f50c4ddc (diff)
parentcfdc41deed280bddbcc6c3cf45e30f33ea139e88 (diff)
downloadFOSSEE_animations-7c650b158109a9d59882365d26f0327390268f13.tar.gz
FOSSEE_animations-7c650b158109a9d59882365d26f0327390268f13.tar.bz2
FOSSEE_animations-7c650b158109a9d59882365d26f0327390268f13.zip
removed merge conflicts
Diffstat (limited to '.idea/modules.xml')
-rw-r--r--.idea/modules.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..3dd842f
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/.idea/FOSSEE_animations.iml" filepath="$PROJECT_DIR$/.idea/FOSSEE_animations.iml" />
+ </modules>
+ </component>
+</project> \ No newline at end of file