From aa65e338c2d74d60dab0159f35309a37f11f7d9d Mon Sep 17 00:00:00 2001
From: Natthan Krish <natthankrish@Nates-MacBook-Pro.local>
Date: Wed, 20 Mar 2024 14:41:23 +0700
Subject: [PATCH] fix: conflict gradle build
---
app/build.gradle.kts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4150f9a..1c156e5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -55,15 +55,11 @@ dependencies {
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("com.google.devtools.ksp:symbol-processing-api:1.9.22-1.0.17")
implementation("androidx.compose.runtime:runtime:1.6.3")
-<<<<<<< HEAD
val coroutine_version = "1.7.1"
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutine_version")
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutine_version")
-=======
- implementation("androidx.cardview:cardview:1.0.0")
implementation("androidx.security:security-crypto:1.1.0-alpha03")
->>>>>>> 42291d02eb0b171d9b9ce992083e978aa5d159b2
val nav_version = "2.7.7"
implementation("androidx.navigation:navigation-fragment-ktx:$nav_version")
--
GitLab