IvanaE 13de8619d9 fixed merge conflict, when you pull check the right dependency is in your build.gradle file		2018-10-10 13:44:55 -04:00
..
.idea	fixed merge conflict, when you pull check the right dependency is in your build.gradle file	2018-10-10 13:44:55 -04:00
app	fixed merge conflict, when you pull check the right dependency is in your build.gradle file	2018-10-10 13:44:55 -04:00
gradle/wrapper	fixed some file inconsistencies	2018-10-05 11:40:22 -04:00
.gitignore	Added android project	2018-09-28 15:39:43 -04:00
build.gradle	fixed merge conflict, when you pull check the right dependency is in your build.gradle file	2018-10-10 13:44:55 -04:00
gradle.properties	Added android project	2018-09-28 15:39:43 -04:00
gradlew	Added android project	2018-09-28 15:39:43 -04:00
gradlew.bat	Added android project	2018-09-28 15:39:43 -04:00
settings.gradle	Added android project	2018-09-28 15:39:43 -04:00