# Conflicts:
#	Cartfile
#	Cartfile.resolved
#	Client.xcodeproj/project.pbxproj
#	Client.xcodeproj/xcshareddata/xcschemes/Firefox.xcscheme
#	Client.xcodeproj/xcshareddata/xcschemes/FirefoxBeta.xcscheme
#	Client/Application/AppDelegate.swift
#	Client/Application/LeanplumIntegration.swift
#	Client/Assets/MainFrameAtDocumentEnd.js
#	Client/Assets/MainFrameAtDocumentStart.js
#	Client/Frontend/Browser/BrowserViewController.swift
#	Client/Frontend/Browser/TabLocationView.swift
#	Client/Info.plist
#	Extensions/NotificationService/Info.plist
#	Extensions/SendTo/Info.plist
#	Extensions/ShareTo/Info.plist
#	Extensions/Today/Info.plist
#	Extensions/ViewLater/Info.plist
#	ThirdParty/BuddyBuild/BuddyBuildSDK.framework/BuddyBuildSDK
#	ThirdParty/BuddyBuild/BuddyBuildSDK.framework/Headers/BuddyBuildSDK.h
#	ThirdParty/BuddyBuild/BuddyBuildSDK.framework/build.num
#	ThirdParty/Leanplum/Leanplum.framework/Headers/LPInbox.h
#	ThirdParty/Leanplum/Leanplum.framework/Headers/Leanplum.h
#	ThirdParty/Leanplum/Leanplum.framework/Info.plist
#	ThirdParty/Leanplum/Leanplum.framework/Leanplum
#	ThirdParty/Leanplum/Leanplum.framework/Modules/module.modulemap
#	fastlane/actions/import_build_tools.rb
#	package.json