fixed merged conflicts from PR #56

contentstack · Jun 19, 2024 · 4df3ecc · 4df3ecc
1 parent c4d9987
commit 4df3ecc
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/contentstack/build.gradle b/contentstack/build.gradle
@@ -103,13 +103,8 @@ android {
         versionCode 1
         versionName "1.0"
         useLibrary 'org.apache.http.legacy'
-<<<<<<< Updated upstream
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         signingConfig signingConfigs.release
-=======
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-       signingConfig signingConfigs.release
->>>>>>> Stashed changes
     }