Resolved conflicts.

Author: SDGGiesbrecht

Sources/PackageModel/Manifest.swift

@@ -221,12 +221,6 @@ public final class Manifest: ObjectIdentifierProtocol {
                 // Dependencies known to not have any relevant products are discarded.
                 return nil
             }
-<<<<<<< HEAD
-            #else
-            return dependency.filtered(by: .everything)
-            #endif
-=======
->>>>>>> parent of 27f444f6... Temporarily disable target-based dependency resolution (#2998)
         }
     }
 

Tests/PackageModelTests/ManifestTests.swift

@@ -150,12 +150,7 @@ class ManifestTests: XCTestCase {
                 targets: targets
             )
 
-<<<<<<< HEAD
-            #if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
             XCTAssertEqual(manifest.dependenciesRequired(for: .specific(["Foo"])).map({ $0.name }).sorted(), [
-=======
-            XCTAssertEqual(manifest.dependenciesRequired(for: .specific(["Foo"])).map({ $0.declaration.name }).sorted(), [
->>>>>>> parent of 27f444f6... Temporarily disable target-based dependency resolution (#2998)
                 "Bar1", // Foo → Foo1 → Bar1
                 "Bar2", // Foo → Foo1 → Foo2 → Bar2
                 // (Bar3 is unreachable.)