Switch to branch of BSK

duckduckgo · Jun 26, 2024 · b6eae6f · b6eae6f
1 parent 5894c35
commit b6eae6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git 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
@@ -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
       }
     },
     {