Skip to content

Commit 93918ca

Browse files
Merge pull request #7 from agrawalsuneet/dev
Merge Dev to master for 0.4 release
2 parents 671a8b3 + a3d8c03 commit 93918ca

37 files changed

+202
-1231
lines changed

.gitignore

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,26 @@ captures/
3535
# Intellij
3636
*.iml
3737
.idea/workspace.xml
38+
.idea/tasks.xml
39+
.idea/gradle.xml
40+
.idea/dictionaries
41+
.idea/libraries
42+
.idea/cache
3843

3944
# Keystore files
4045
*.jks
46+
47+
# External native build folder generated in Android Studio 2.2 and later
48+
.externalNativeBuild
49+
50+
# Google Services (e.g. APIs or Firebase)
51+
google-services.json
52+
53+
# Freeline
54+
freeline.py
55+
freeline/
56+
freeline_project_description.json
57+
58+
59+
*/.DS_STORE
60+
./idea

.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

.idea/gradle.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.idea/libraries/com_android_support_animated_vector_drawable_25_3_0.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.idea/libraries/com_android_support_appcompat_v7_25_3_0.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.idea/libraries/com_android_support_constraint_constraint_layout_1_0_2.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.idea/libraries/com_android_support_constraint_constraint_layout_solver_1_0_2_jar.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.idea/libraries/com_android_support_support_annotations_25_3_0_jar.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/com_android_support_support_compat_25_3_0.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.idea/libraries/com_android_support_support_core_ui_25_3_0.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)