Fixed merge conflicts

This commit is contained in:
Arnfried Griesert
2023-03-20 07:33:28 +01:00
parent 28852aa790
commit 4727a3ddf2
8 changed files with 12 additions and 17 deletions
@@ -23,7 +23,7 @@ import Foundation
enum StaticLocationViewingViewAction {
case close
case share
// case mapCreditsDidTap // $$$ 1.10.5 does not have this enum case
case mapCreditsDidTap
case showUserLocation
}