Merge branch 'develop' of https://github.com/APP-Android2/FinalProjec…

…t-ShoppingMallService-team5 into 44-feature-자유게시판-데이터-적용 # Conflicts: # MungNolZa/app/src/main/AndroidManifest.xml # MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/PetsitterReviewWriteActivity.kt
APP-Android2 · Apr 17, 2024 · 9de5d40 · 9de5d40
2 parents cfc2445 + 7466e15
commit 9de5d40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/MungNolZa/app/src/main/AndroidManifest.xml b/MungNolZa/app/src/main/AndroidManifest.xml
@@ -21,8 +21,6 @@
         android:theme="@style/Theme.MungNolZa"
         tools:targetApi="31">
         <activity
-
-
             android:name=".ui.freeboard.AddBoardActivity"
             android:exported="false" />
 
@@ -84,7 +82,6 @@
         <activity
             android:name=".ui.intro.activity.LoginActivity"
             android:exported="true" />
-
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="AIzaSyCgqqrHlGVDDd9td3yIA-LWul8eRStLv54" />

diff --git a/...pp/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/PetsitterReviewWriteActivity.kt b/...pp/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/PetsitterReviewWriteActivity.kt
@@ -15,10 +15,13 @@ import kr.co.lion.mungnolza.ext.hideSoftInput
 import kr.co.lion.mungnolza.ext.showErrorDialog
 import kr.co.lion.mungnolza.model.PetsitterReviewModel
 
+
+
 import kr.co.lion.mungnolza.ui.reservation_list.viewmodel.PetSitterReviewWriteViewModel
 import kr.co.lion.mungnolza.util.ReservationListFragmentName
 import java.text.SimpleDateFormat
 import java.util.Date
+
 // ContextExt.kt에 정의된 확장 함수를 import
 import kr.co.lion.mungnolza.ext.hideSoftInput
 import kr.co.lion.mungnolza.ext.showErrorDialog