사랑해요

jlstdio · Jul 19, 2019 · cbaba72 · cbaba72
1 parent 107f19c
commit cbaba72
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,17 +26,10 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:26.1.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
-<<<<<<< HEAD
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.google.firebase:firebase-core:16.0.8'
     implementation 'com.google.firebase:firebase-database:16.1.0'
-=======
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    implementation 'com.google.firebase:firebase-core:11.8.0'
-    implementation 'com.google.firebase:firebase-database:11.8.0'
->>>>>>> tempmaster
     implementation 'com.android.support:cardview-v7:26.1.0'
     implementation 'com.squareup.okhttp:okhttp:2.7.2'
     implementation 'com.google.firebase:firebase-ads:11.8.0'

diff --git a/build.gradle b/build.gradle
@@ -10,13 +10,8 @@ buildscript {
         }
     }
     dependencies {
-<<<<<<< HEAD
         classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.google.gms:google-services:4.0.1'
-=======
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.google.gms:google-services:3.1.0'
->>>>>>> tempmaster
 
 
         // NOTE: Do not place your application dependencies here; they belong