cleaned merge conflict dirt

wordpress-mobile · Oct 13, 2017 · 2a11885 · 2a11885
1 parent 75d8e32
commit 2a11885
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -134,11 +134,7 @@ dependencies {
     apt 'com.google.dagger:dagger-compiler:2.0.2'
     provided 'org.glassfish:javax.annotation:10.0-b28'
 
-<<<<<<< HEAD
-    compile ('com.github.wordpress-mobile.WordPress-FluxC-Android:fluxc:f68900cba331c0cb2a911885749b4160c496488d') {
-=======
     compile ('com.github.wordpress-mobile.WordPress-FluxC-Android:fluxc:6422c5020f442bbe42003cb1ae887b8f898e1d2d') {
->>>>>>> hotfix/8.3.1
         exclude group: "com.android.volley";
     }