fixes merge conflicts

2017-05-11 18:58:38 -04:00 · 2017-05-11 18:58:38 -04:00 · 66bac21236
commit 66bac21236
parent 68eaa742ee 9bb8c96f00
5 changed files with 65 additions and 1 deletions
--- a/build.gradle
+++ b/build.gradle
@ -5,7 +5,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:2.3.2'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files