From 66a0e015fba9a9ad93971547bd0fedfb3db9c301 Mon Sep 17 00:00:00 2001
From: Ethan Neff <ethan.neff@eneff.com>
Date: Mon, 7 Aug 2017 08:56:11 -0700
Subject: [PATCH] fix: android dependency conflicts

---
 build.gradle | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index a51a7572..dc5510d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,12 +7,12 @@ android {
 dependencies {
   // multidex for frameworks
   compile 'com.android.support:multidex:1.0.1'
-  // branch sdk
+  // Branch sdk
   compile 'io.branch.sdk.android:library:2+'
-  // branch app indexing
-  compile 'com.google.android.gms:play-services-appindexing:9.+'
-  // branch chrome tabs for better matching
-  compile 'com.android.support:customtabs:23.3.0'
-  // branch gaid for better device matching (TODO: turned off because it conflicts with other plugins)
+  // Branch app indexing
+  // compile 'com.google.android.gms:play-services-appindexing:9.+'
+  // Branch chrome tabs for better matching
+  // compile 'com.android.support:customtabs:23.3.0'
+  // Branch GAID for better device matching (TODO: turned off because it conflicts with other plugins)
   // compile 'com.google.android.gms:play-services-ads:11+'
 }
\ No newline at end of file