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/.gitignore | |
| 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/.gitignore')
| -rw-r--r-- | .idea/.gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..3889a9e --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,6 @@ + +# Default ignored files +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml
\ No newline at end of file |