Fix merge conflicts

Author: grynspan

Sources/Commands/PackageCommands/Init.swift

@@ -59,13 +59,8 @@ extension SwiftPackageCommand {
             // Which testing libraries should be used? XCTest is on by default,
             // but Swift Testing must remain off by default until it is present
             // in the Swift toolchain.
-<<<<<<< Updated upstream
             var supportedTestingLibraries = Set<BuildParameters.Testing.Library>()
-            if testLibraryOptions.isEnabled(.xctest) {
-=======
-            var supportedTestingLibraries = Set<TestingLibrary>()
             if testLibraryOptions.isEnabled(.xctest, swiftCommandState: swiftCommandState) {
->>>>>>> Stashed changes
                 supportedTestingLibraries.insert(.xctest)
             }
             if testLibraryOptions.isExplicitlyEnabled(.swiftTesting, swiftCommandState: swiftCommandState) {

Sources/CoreCommands/Options.swift

@@ -598,11 +598,7 @@ public struct TestLibraryOptions: ParsableArguments {
           help: .private)
     public var explicitlyEnableExperimentalSwiftTestingLibrarySupport: Bool?
 
-<<<<<<< Updated upstream
-    private func isEnabled(_ library: BuildParameters.Testing.Library, `default`: Bool) -> Bool {
-=======
-    private func isEnabled(_ library: TestingLibrary, `default`: Bool, swiftCommandState: SwiftCommandState) -> Bool {
->>>>>>> Stashed changes
+    private func isEnabled(_ library: BuildParameters.Testing.Library, `default`: Bool, swiftCommandState: SwiftCommandState) -> Bool {
         switch library {
         case .xctest:
             if let explicitlyEnableXCTestSupport {
@@ -618,29 +614,13 @@ public struct TestLibraryOptions: ParsableArguments {
         }
     }
 
-    /// Test whether or not a given library is enabled.
-<<<<<<< Updated upstream
-    public func isEnabled(_ library: BuildParameters.Testing.Library) -> Bool {
-        isEnabled(library, default: true)
-    }
-
-    /// Test whether or not a given library was explicitly enabled by the developer.
-    public func isExplicitlyEnabled(_ library: BuildParameters.Testing.Library) -> Bool {
-        isEnabled(library, default: false)
-    }
-
-    /// The list of enabled testing libraries.
-    public var enabledTestingLibraries: [BuildParameters.Testing.Library] {
-        [.xctest, .swiftTesting].filter(isEnabled)
-=======
-    public func isEnabled(_ library: TestingLibrary, swiftCommandState: SwiftCommandState) -> Bool {
+    public func isEnabled(_ library: BuildParameters.Testing.Library, swiftCommandState: SwiftCommandState) -> Bool {
         isEnabled(library, default: true, swiftCommandState: swiftCommandState)
     }
 
     /// Test whether or not a given library was explicitly enabled by the developer.
-    public func isExplicitlyEnabled(_ library: TestingLibrary, swiftCommandState: SwiftCommandState) -> Bool {
+    public func isExplicitlyEnabled(_ library: BuildParameters.Testing.Library, swiftCommandState: SwiftCommandState) -> Bool {
         isEnabled(library, default: false, swiftCommandState: swiftCommandState)
->>>>>>> Stashed changes
     }
 }