Commit b702cd6
committed
Merge branch 'feature/HomeDetail' of https://github.com/Swift-Coding-Club/TogetherApp into feature/HomeDetail
# Conflicts:
# MarketApp/.DS_Store
# MarketApp/MarketApp.xcodeproj/project.pbxproj
# MarketApp/MarketApp/View/ProductDetail/DetailImageView.swift
# MarketApp/fastlane/Deliverfile
# MarketApp/fastlane/metadata/ko/description.txt
# MarketApp/fastlane/metadata/ko/keywords.txt
# MarketApp/fastlane/metadata/ko/promotional_text.txt
# MarketApp/fastlane/metadata/ko/release_notes.txt
# MarketApp/fastlane/report.xmlFile tree
22 files changed
+1
-51
lines changed- MarketApp/fastlane
- metadata
- ko
- review_information
- screenshots
22 files changed
+1
-51
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
0 commit comments