resolve conflicts

innovationacademy-kr · Jun 7, 2024 · 0791aa8 · 0791aa8
1 parent 923ab7d
commit 0791aa8
Showing 1 changed file with 0 additions and 7 deletions.
diff --git 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