Skip to content

Commit

Permalink
Merge branch 'iOS/epic/JourneyListScene' into iOS/task/JourneyList-Bu…
Browse files Browse the repository at this point in the history
…siness-Logic

# Conflicts:
#	iOS/Features/JourneyList/Package.swift
  • Loading branch information
SwiftyJunnos committed Nov 30, 2023
2 parents 2943874 + aaf9a86 commit c937797
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions iOS/Features/JourneyList/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import PackageDescription
private extension String {

static let package = "FeatureJourneyList"

var fromRootPath: String {
return "../../" + self
}

var fromRootPath: String {
return "../../" + self
Expand Down
2 changes: 1 addition & 1 deletion iOS/MusicSpot.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c937797

Please sign in to comment.