From 0791aa87ea13ca6cf28c693968cfa3cd33fa7171 Mon Sep 17 00:00:00 2001
From: Hee Ju Jang <01kathyy@gmail.com>
Date: Fri, 7 Jun 2024 15:15:56 +0900
Subject: [PATCH] resolve conflicts

---
 HANE24/Model/Error.swift | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/HANE24/Model/Error.swift b/HANE24/Model/Error.swift
index a6bfb23..047c60f 100644
--- a/HANE24/Model/Error.swift
+++ b/HANE24/Model/Error.swift
@@ -2,16 +2,11 @@
 //  Error.swift
 //  24HANE
 //
-<<<<<<< HEAD
-//  Created by Katherine JANG on 5/10/24.
-=======
 //  Created by Hosung Lim on 5/8/24.
->>>>>>> dev
 //
 
 import Foundation
 
-<<<<<<< HEAD
 enum CustomError: Error {
     case tokenExpired
     case wrongQueryType
@@ -77,7 +72,6 @@ extension CustomError: LocalizedError {
     }
 }
 
-=======
 // API 처리에 대한 실패
 enum ReissueError: Error {
     case tokenExpired(String)
@@ -96,4 +90,3 @@ enum NetworkError: Error {
     case tokenExpired(String)
     case networkError(Int, String)
 }
->>>>>>> dev