충돌 해결

mash-up-kr · Aug 29, 2022 · 2f1fa5c · 2f1fa5c
1 parent 8ad0afb
commit 2f1fa5c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Projects/Features/GuestList/Targets/Scene/Sources/GuestListViewController.swift b/Projects/Features/GuestList/Targets/Scene/Sources/GuestListViewController.swift
@@ -67,11 +67,7 @@ public class GuestListViewController: UIViewController, GuestListDisplayLogic {
         let v = UIView()
         return v
     }()
-<<<<<<< HEAD
 
-=======
-
->>>>>>> develop
     lazy var likeListButton: UIImageView = {
         let v = UIImageView()
         v.image = .create(.ic_heart)