# Conflicts: # 1Weather.xcodeproj/project.pbxproj # 1Weather.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist # Podfile.lock # Pods/Manifest.lock