project.pbxproj
1.29 MB
-
Merge branch 'feature/IOS-74-apps-flyer' into develop · c8ec630f# Conflicts: # 1Weather/Model/Settings/Settings.swift # Podfile.lock # Pods/Manifest.lock # Pods/Pods.xcodeproj/project.pbxproj # Pods/Target Support Files/Pods-1Weather/Pods-1Weather.debug.xcconfig # Pods/Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig
Demid Merzlyakov committed