Skip to content

Commit

Permalink
Test a different approach to merge conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
@samsymons
samsymons committed Nov 14, 2023
1 parent 88f07dc commit 0eeef8b
Showing 1 changed file with 0 additions and 24 deletions.
24 changes: 0 additions & 24 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@
37FCAAC029930E26000E420A /* FailedAssertionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FCAABF29930E26000E420A /* FailedAssertionView.swift */; };
37FD780F2A29E28B00B36DB1 /* SyncErrorHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FD780E2A29E28B00B36DB1 /* SyncErrorHandler.swift */; };
4B0295192537BC6700E00CEF /* ConfigurationDebugViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0295182537BC6700E00CEF /* ConfigurationDebugViewController.swift */; };
4B274F5D2AFDB871003F0745 /* VPNWaitlistDebugViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B274F5C2AFDB871003F0745 /* VPNWaitlistDebugViewController.swift */; };
4B2754EC29E8C7DF00394032 /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4B2754EB29E8C7DF00394032 /* Lottie */; };
4B470ED6299C49800086EBDC /* AppTrackingProtectionDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B470ED5299C49800086EBDC /* AppTrackingProtectionDatabase.swift */; };
4B470ED9299C4AED0086EBDC /* AppTrackingProtectionModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 4B470ED7299C4AED0086EBDC /* AppTrackingProtectionModel.xcdatamodeld */; };
Expand All @@ -276,9 +275,6 @@
4B470EE4299C6DFB0086EBDC /* Core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F143C2E41E4A4CD400CFDE3A /* Core.framework */; };
4B52648B25F9613B00CB4C24 /* trackerData.json in Resources */ = {isa = PBXBuildFile; fileRef = 4B52648A25F9613B00CB4C24 /* trackerData.json */; };
4B53648A26718D0E001AA041 /* EmailWaitlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B53648926718D0E001AA041 /* EmailWaitlist.swift */; };
4B5C46232AF1B4D4002A4432 /* VPNWaitlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5C46222AF1B4D4002A4432 /* VPNWaitlist.swift */; };
4B5C46252AF1BEAA002A4432 /* VPNWaitlistView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5C46242AF1BEAA002A4432 /* VPNWaitlistView.swift */; };
4B5C46272AF1C075002A4432 /* VPNWaitlistViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5C46262AF1C075002A4432 /* VPNWaitlistViewController.swift */; };
4B60AC97252EC07B00E8D219 /* fullscreenvideo.js in Resources */ = {isa = PBXBuildFile; fileRef = 4B60AC96252EC07B00E8D219 /* fullscreenvideo.js */; };
4B60ACA1252EC0B100E8D219 /* FullScreenVideoUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B60ACA0252EC0B100E8D219 /* FullScreenVideoUserScript.swift */; };
4B62C4BA25B930DD008912C6 /* AppConfigurationFetchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B62C4B925B930DD008912C6 /* AppConfigurationFetchTests.swift */; };
Expand Down Expand Up @@ -1286,17 +1282,13 @@
37FCAACB2993149A000E420A /* Waitlist */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Waitlist; sourceTree = "<group>"; };
37FD780E2A29E28B00B36DB1 /* SyncErrorHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncErrorHandler.swift; sourceTree = "<group>"; };
4B0295182537BC6700E00CEF /* ConfigurationDebugViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigurationDebugViewController.swift; sourceTree = "<group>"; };
4B274F5C2AFDB871003F0745 /* VPNWaitlistDebugViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNWaitlistDebugViewController.swift; sourceTree = "<group>"; };
4B470ED5299C49800086EBDC /* AppTrackingProtectionDatabase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTrackingProtectionDatabase.swift; sourceTree = "<group>"; };
4B470ED8299C4AED0086EBDC /* AppTrackingProtectionModel.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = AppTrackingProtectionModel.xcdatamodel; sourceTree = "<group>"; };
4B470EDA299C4FB20086EBDC /* AppTrackingProtectionListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTrackingProtectionListViewModel.swift; sourceTree = "<group>"; };
4B470EDE299C67270086EBDC /* AppTrackerEntity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTrackerEntity.swift; sourceTree = "<group>"; };
4B470EE2299C6DD10086EBDC /* AppTrackingProtectionStoringModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTrackingProtectionStoringModel.swift; sourceTree = "<group>"; };
4B52648A25F9613B00CB4C24 /* trackerData.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = trackerData.json; sourceTree = "<group>"; };
4B53648926718D0E001AA041 /* EmailWaitlist.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailWaitlist.swift; sourceTree = "<group>"; };
4B5C46222AF1B4D4002A4432 /* VPNWaitlist.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNWaitlist.swift; sourceTree = "<group>"; };
4B5C46242AF1BEAA002A4432 /* VPNWaitlistView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNWaitlistView.swift; sourceTree = "<group>"; };
4B5C46262AF1C075002A4432 /* VPNWaitlistViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNWaitlistViewController.swift; sourceTree = "<group>"; };
4B60AC96252EC07B00E8D219 /* fullscreenvideo.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = fullscreenvideo.js; sourceTree = "<group>"; };
4B60ACA0252EC0B100E8D219 /* FullScreenVideoUserScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullScreenVideoUserScript.swift; sourceTree = "<group>"; };
4B62C4B925B930DD008912C6 /* AppConfigurationFetchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppConfigurationFetchTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3402,25 +3394,13 @@
name = AppTrackingProtection;
sourceTree = "<group>";
};
4B5C46212AF1B436002A4432 /* VPN */ = {
isa = PBXGroup;
children = (
4B5C46222AF1B4D4002A4432 /* VPNWaitlist.swift */,
4B5C46242AF1BEAA002A4432 /* VPNWaitlistView.swift */,
4B5C46262AF1C075002A4432 /* VPNWaitlistViewController.swift */,
4B274F5C2AFDB871003F0745 /* VPNWaitlistDebugViewController.swift */,
);
name = VPN;
sourceTree = "<group>";
};
4B6484F427FD1E390050A7A1 /* Waitlist */ = {
isa = PBXGroup;
children = (
37FCAAAA29911BF1000E420A /* WaitlistExtensions.swift */,
56244C1C2A137B1900EDF259 /* WaitlistViews.swift */,
37FCAAA0299117F9000E420A /* MacBrowser */,
37FCAAA129911801000E420A /* WindowsBrowser */,
4B5C46212AF1B436002A4432 /* VPN */,
8524AAAB2A3888FE00EEC6D2 /* Waitlist.xcassets */,
);
name = Waitlist;
Expand Down Expand Up @@ -6275,7 +6255,6 @@
1EE7C299294227EC0026C8CB /* AutoconsentSettingsViewController.swift in Sources */,
1E8AD1D527C2E22900ABA377 /* DownloadsListSectionViewModel.swift in Sources */,
4BC6DD1C2A60E6AD001EC129 /* ReportBrokenSiteView.swift in Sources */,
4B274F5D2AFDB871003F0745 /* VPNWaitlistDebugViewController.swift in Sources */,
31584616281AFB46004ADB8B /* AutofillLoginDetailsViewController.swift in Sources */,
C1F341C72A6924100032057B /* EmailAddressPromptViewModel.swift in Sources */,
F47E53D9250A97330037C686 /* OnboardingDefaultBroswerViewController.swift in Sources */,
Expand Down Expand Up @@ -6399,14 +6378,12 @@
3132FA2C27A07A1B00DD7A12 /* FilePreview.swift in Sources */,
85C861E628FF1B5F00189466 /* HomeViewSectionRenderersExtension.swift in Sources */,
F1D477C61F2126CC0031ED49 /* OmniBarState.swift in Sources */,
4B5C46232AF1B4D4002A4432 /* VPNWaitlist.swift in Sources */,
85F2FFCD2211F615006BB258 /* MainViewController+KeyCommands.swift in Sources */,
0268FC132A449F04000EE6A2 /* OnboardingContainerView.swift in Sources */,
858650D9246B0D3C00C36F8A /* DaxOnboardingViewController.swift in Sources */,
312E5746283BB04A00C18FA0 /* AutofillEmptySearchView.swift in Sources */,
F1A5683A1E70F98E0081082E /* AutocompleteRequest.swift in Sources */,
8565A34B1FC8D96B00239327 /* LaunchTabNotification.swift in Sources */,
4B5C46252AF1BEAA002A4432 /* VPNWaitlistView.swift in Sources */,
0290472829E861BE0008FE3C /* AppTPTrackerDetailViewModel.swift in Sources */,
311BD1AD2836BB3900AEF6C1 /* AutofillItemsEmptyView.swift in Sources */,
C1F341C52A6924000032057B /* EmailAddressPromptView.swift in Sources */,
Expand Down Expand Up @@ -6449,7 +6426,6 @@
85DFEDEF24C7EA3B00973FE7 /* SmallOmniBarState.swift in Sources */,
1E908BF129827C480008C8F3 /* AutoconsentUserScript.swift in Sources */,
4B0295192537BC6700E00CEF /* ConfigurationDebugViewController.swift in Sources */,
4B5C46272AF1C075002A4432 /* VPNWaitlistViewController.swift in Sources */,
1E7A71192934EC6100B7EA19 /* OmniBarNotificationContainerView.swift in Sources */,
984D035C24AE15CD0066CFB8 /* TabSwitcherSettings.swift in Sources */,
98B31292218CCB8C00E54DE1 /* AppDependencyProvider.swift in Sources */,
Expand Down

0 comments on commit 0eeef8b

Please sign in to comment.