Fix wrong merge

fabpot · fabpot · commit e40062644d2e · 2023-10-28T16:47:29.000-07:00
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
@@ -276,12 +276,8 @@ public static function provideCompileTests(): iterable
             'expectedJavaScriptImports' => ['module_in_importmap_remote' => ['lazy' => false, 'asset' => 'module_in_importmap_remote.js', 'add' => false]],
         ];
 
-<<<<<<< HEAD
-        yield 'absolute_import_added_as_dependency_only' => [
-=======
         yield 'absolute_import_ignored_and_no_dependency_added' => [
             'sourceLogicalName' => 'app.js',
->>>>>>> a79f543f8f ([AssetMapper] Fix file deleting errors & remove nullable MappedAsset on JS import)
             'input' => 'import "https://example.com/module.js";',
             'expectedJavaScriptImports' => [],
         ];
