project.pbxproj
1.6 MB
-
Merge branch 'release/5.3' into develop · 589f5120# Conflicts: # 1Weather-Icons.sketch # 1Weather.xcodeproj/project.pbxproj # 1Weather.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist # 1Weather.xcworkspace/contents.xcworkspacedata # 1Weather.xcworkspace/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist # 1Weather/AppDelegate.swift # 1Weather/Resources/en.lproj/Localizable.strings # 1Weather/UI/Helpers/AppFont.swift # OneWeatherAnalytics/OneWeatherAnalytics/AnalyticsEvent.swift # OneWeatherAnalytics/OneWeatherAnalytics/AnalyticsParameter.swift # OneWeatherCore/OneWeatherCore.xcodeproj/project.pbxproj # OneWeatherCore/OneWeatherCore/Model/LocationManager.swift # PG.playground/Contents.swift # Podfile.lock # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdBannerDispatcher.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdInterstitialViewController.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdLoader.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdResponse+Mediation.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdResponse.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdView.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBDebugProperties.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBErrorCodes.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBExpectedSize.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBLog.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBMediationConstants.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/UIView+DTB.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/aps_mobile_client_config.json # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdBannerDispatcher.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdInterstitialViewController.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdLoader.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdResponse+Mediation.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdResponse.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdView.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBDebugProperties.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBErrorCodes.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBExpectedSize.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBLog.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBMediationConstants.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/UIView+DTB.h # Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/aps_mobile_client_config.json # Pods/Manifest.lock # Pods/Pods.xcodeproj/project.pbxproj # Pods/Swarm/Swarm/SwarmTileOverlayRenderer.swift # Pods/Target Support Files/FBSDKCoreKit/FBSDKCoreKit-Info.plist # Pods/Target Support Files/Nuke-WebP-Plugin/Nuke-WebP-Plugin-Info.plist # Pods/Target Support Files/Pods-1Weather/Pods-1Weather.debug.xcconfig # Pods/Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig # Pods/Target Support Files/Pods-OneWeatherWidgetExtension/Pods-OneWeatherWidgetExtension-Info.plist
Dmitriy Stepanets committed