# Conflicts: # 1Weather.xcodeproj/project.pbxproj # 1Weather/AppDelegate.swift # 1Weather/Network/Configuration/ConfigManager.swift # CoreDataStorage/CoreDataStorage.xcodeproj/project.pbxproj