From b6eae6f0523265e292ea61118fd3dd7bdea65bee Mon Sep 17 00:00:00 2001 From: Michal Smaga Date: Wed, 26 Jun 2024 22:01:27 +0200 Subject: [PATCH] Switch to branch of BSK --- DuckDuckGo.xcodeproj/project.pbxproj | 5 +++++ .../xcshareddata/swiftpm/Package.resolved | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index be1b537455..7c504c0c61 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9821,8 +9821,13 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { +<<<<<<< Updated upstream kind = exactVersion; version = 161.1.2; +======= + branch = "michal/update-manage-subscription"; + kind = branch; +>>>>>>> Stashed changes }; }; 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index d8ca804f52..d372de31e9 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,13 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { +<<<<<<< Updated upstream "revision" : "cde956dec771bb7196ab3f4b07e00254e433d58d", "version" : "161.1.2" +======= + "branch" : "michal/update-manage-subscription", + "revision" : "60cdef45aae5e2f015decea813b5a9efa4e1c874" +>>>>>>> Stashed changes } }, {