[#196] FIX: Conflict 해결

Hous-Release · Aug 21, 2023 · 7cb3570 · 7cb3570
1 parent d0cdb9a
commit 7cb3570
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift b/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift
@@ -32,13 +32,8 @@ final class ProfileAlarmSettingViewController: BaseViewController, LoadingPresen
 
   private let navigationBarView = NavBarWithBackButtonView(
     title: "알림",
-<<<<<<< Updated upstream
-    rightButtonText: ""
-  )
-=======
     rightButtonText: "",
     isSeparatorLineHidden: false)
->>>>>>> Stashed changes
 
   private let alarmSettingCollectionView: UICollectionView = {
     let layout = UICollectionViewFlowLayout()