From 1d88b416e219d69ab14528bf380a7cf49b3ebcd9 Mon Sep 17 00:00:00 2001
From: wu2018 <45372357+daguehw@users.noreply.github.com>
Date: Mon, 23 Nov 2020 17:53:27 +0100
Subject: [PATCH] pull
---
app/build.gradle | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 8e32017..6594e35 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,10 +40,8 @@ dependencies {
implementation "androidx.recyclerview:recyclerview:1.1.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.+'
-<<<<<<< HEAD
// androidTestImplementation 'com.android.support.test:runner:1.0.2'
-=======
+
//androidTestImplementation 'com.android.support.test:runner:1.0.2'
->>>>>>> 36446a79a955a5ec115e137ca38bcb6976aede75
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}
\ No newline at end of file
--
GitLab