build: resolve merge conflict

sopt-makers · Jan 20, 2025 · 5efda1e · 5efda1e
2 parents a22f7ca + 4bfd49c
commit 5efda1e
Show file tree

Hide file tree

Showing 73 changed files with 36,470 additions and 16,160 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 **국내 최대 IT 벤처창업동아리 SOPT의 공식 Android 앱**
 
 <p align="center">
-    <img src="https://img.shields.io/badge/Kotlin-2.0.21-7F52FF?style=for-the-badge&logo=Kotlin&logoColor=white"/>
+    <img src="https://img.shields.io/badge/Kotlin-2.1.0-7F52FF?style=for-the-badge&logo=Kotlin&logoColor=white"/>
     <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
     <img src="https://img.shields.io/badge/all_contributors-17-orange.svg?style=for-the-badge"/>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -157,6 +157,7 @@ dependencies {
     implementation(libs.bundles.compose)
     implementation(libs.startup)
     implementation(libs.swipe.refresh.layout)
+    debugImplementation(libs.compose.ui.tooling)
 
     implementation(libs.inappupdate)
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -149,7 +149,6 @@
             android:name=".feature.fortune.FortuneActivity"
             android:exported="true"
             android:launchMode="singleTop" />
-
         <service
             android:name=".config.messaging.SoptFirebaseMessagingService"
             android:exported="false">