# Conflicts:
#	1Weather.xcodeproj/project.pbxproj
#	1Weather.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist
#	1Weather/Network/ConfigManager.swift
#	1Weather/UI/Helpers/ForecastTimePeriod/ForecastTimePeriodView.swift
#	1Weather/UI/View controllers/Today/Cells/TodayCellFactory.swift
#	1Weather/UI/View controllers/Today/Cells/TodayDayTimesCell/TodayDayTimesCell.swift
#	1Weather/ViewModels/TodayViewModel.swift
#	OneWeatherAnalytics/OneWeatherAnalytics/Services/AppsFlyerAnalyticsService.swift
#	Podfile.lock
#	Pods/Manifest.lock