From 7cb35707fed62fa70e4ae458031ba176f8c6d7c9 Mon Sep 17 00:00:00 2001
From: lee-euiji <leeuj9663@naver.com>
Date: Sun, 16 Jul 2023 15:23:18 +0900
Subject: [PATCH] =?UTF-8?q?[#196]=20FIX:=20Conflict=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewController/ProfileAlarmSettingViewController.swift   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift b/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift
index fff324b7..a72b5932 100644
--- 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()