🐛 머지 에러 수정

boostcampwm2023 · Nov 27, 2023 · b4c9512 · b4c9512
1 parent cf9d12d
commit b4c9512
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 390 deletions.
diff --git a/iOS/Features/JourneyList/Sources/JourneyList/Journey.swift b/iOS/Features/JourneyList/Sources/JourneyList/Journey.swift
diff --git a/...List/Sources/JourneyList/Model/File.swift → ...rces/JourneyList/Model/DTOConvertor.swift b/...List/Sources/JourneyList/Model/File.swift → ...rces/JourneyList/Model/DTOConvertor.swift
@@ -1,6 +1,6 @@
 //
-//  File.swift
-//  
+//  DTOConvertor.swift
+//  JourneyList
 //
 //  Created by 이창준 on 2023.11.27.
 //

diff --git a/iOS/Features/JourneyList/Sources/JourneyList/Presentation/View/JourneyInfoHeaderView.swift b/iOS/Features/JourneyList/Sources/JourneyList/Presentation/View/JourneyInfoHeaderView.swift
diff --git a/...eatures/JourneyList/Sources/JourneyList/Presentation/View/JourneyListBackgroundView.swift b/...eatures/JourneyList/Sources/JourneyList/Presentation/View/JourneyListBackgroundView.swift
diff --git a/iOS/Features/JourneyList/Sources/JourneyList/Presentation/View/MusicInfoView.swift b/iOS/Features/JourneyList/Sources/JourneyList/Presentation/View/MusicInfoView.swift
diff --git a/iOS/Features/JourneyList/Sources/JourneyList/Presentation/View/SpotPhotoCell.swift b/iOS/Features/JourneyList/Sources/JourneyList/Presentation/View/SpotPhotoCell.swift