# Conflicts:
#	1Weather.xcodeproj/project.pbxproj
#	1Weather/AppDelegate.swift
#	1Weather/Model/Settings.swift
#	1Weather/Resources/en.lproj/Localizable.strings
#	Podfile.lock
#	Pods/Manifest.lock
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/Pods.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist
#	Pods/Target Support Files/Pods-1Weather/Pods-1Weather.debug.xcconfig
#	Pods/Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig