IvanaE 296aaf05e3 fixed merge conflict, when you pull check the right dependency is in your build.gradle file		2018-10-10 13:44:55 -04:00
..
caches	fixed merge conflict, when you pull check the right dependency is in your build.gradle file	2018-10-10 13:44:55 -04:00
codeStyles	Added android project	2018-09-28 15:39:43 -04:00
gradle.xml	Added android project	2018-09-28 15:39:43 -04:00
misc.xml	fixed merge conflict, when you pull check the right dependency is in your build.gradle file	2018-10-10 13:44:55 -04:00
runConfigurations.xml	Added android project	2018-09-28 15:39:43 -04:00
vcs.xml	fixed merge conflict, when you pull check the right dependency is in your build.gradle file	2018-10-10 13:44:55 -04:00