Fix with cart

108224e5 · Muhammad Suryono · 6de2c8b6 · 108224e5
Commit 108224e5 authored Aug 26, 2020 by Muhammad Suryono
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

build.gradle library/build.gradle +0 -3

No files found.
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -15,8 +15,5 @@ dependencies {
  implementation 'androidx.annotation:annotation:1.0.0'
  testImplementation 'junit:junit:4.12'
 }
-<<<<<<< HEAD

 apply from: rootProject.file('gradle/maven-push.gradle')
-=======
->>>>>>> cart