# Conflicts: # Cartfile # Cartfile.resolved # Client.xcodeproj/project.pbxproj # Client/Application/AdjustIntegration.swift # Client/Application/AppDelegate.swift # Client/Application/LeanplumIntegration.swift # Client/Assets/About/Licenses.html # Client/Assets/Images.xcassets/defaultFavicon.imageset/newtab-icon.png # Client/Assets/Images.xcassets/defaultFavicon.imageset/newtab-icon@2x.png # Client/Assets/Images.xcassets/defaultFavicon.imageset/newtab-icon@3x.png # Client/Assets/MainFrameAtDocumentEnd.js # Client/Assets/MainFrameAtDocumentStart.js # Client/Frontend/Browser/BrowserViewController.swift # Client/Frontend/Browser/Tab.swift # Client/Frontend/Browser/TopTabsViews.swift # Client/Frontend/Browser/URLBarView.swift # Client/Frontend/Settings/AppSettingsOptions.swift # Client/Frontend/Settings/ClearPrivateDataTableViewController.swift # Client/Frontend/UIConstants.swift # Client/Info.plist # Client/Telemetry/UnifiedTelemetry.swift # Extensions/NotificationService/Info.plist # Extensions/SendTo/Info.plist # Extensions/ShareTo/Info.plist # Extensions/ShareTo/ShareViewController.swift # Extensions/Today/Info.plist # Extensions/ViewLater/Info.plist # README.md # 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/Modules/module.modulemap # shipping_locales.txt
