resolved merge conflict

mnbvcxz010308 · Aug 9, 2017 · c16c562 · c16c562
1 parent df14f98
commit c16c562
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
             'compileSdk'    : 26,
             'targetSdk'     : 26,
             'buildTools'    : '26.0.1',
-            'supportLibrary': '26.0.0',
+            'supportLibrary': '26.0.1',
             'retrofit'      : '2.3.0',
             'butterknife'   : '8.7.0',
             'kotlin_version': '1.1.3-2'