# Conflicts: # JellyfinPlayer/SettingsView.swift # JellyfinPlayer/VideoPlayer.swift |
||
---|---|---|
.. | ||
project.xcworkspace | ||
xcshareddata | ||
project.pbxproj |
# Conflicts: # JellyfinPlayer/SettingsView.swift # JellyfinPlayer/VideoPlayer.swift |
||
---|---|---|
.. | ||
project.xcworkspace | ||
xcshareddata | ||
project.pbxproj |