# Conflicts: # 1Weather-Icons.sketch # 1Weather.xcodeproj/project.pbxproj # 1Weather/Resources/en.lproj/Localizable.strings
