Fix merge conflict

src/EditorFeatures/TestUtilities/MinimalTestExportProvider.cs

@@ -129,7 +129,7 @@ public static ExportProvider CreateExportProvider(ComposableCatalog catalog)
             // make sure we enable this for all unit tests
             AsynchronousOperationListenerProvider.Enable(true);
 
-            var configuration = CompositionConfiguration.Create(catalog.WithDesktopSupport().WithCompositionService());
+            var configuration = CompositionConfiguration.Create(catalog.WithCompositionService());
             var runtimeComposition = RuntimeComposition.CreateRuntimeComposition(configuration);
             return runtimeComposition.CreateExportProviderFactory().CreateExportProvider();
         }