Fix conflict in PackageExtensionBrowserViewModel.cs

LykosAI · Dec 5, 2024 · 387041b · 387041b
1 parent d8475dc
commit 387041b
Showing 1 changed file with 0 additions and 22 deletions.
diff --git a/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs
@@ -118,28 +118,6 @@ ServiceManager<ViewModelBase> vmFactory
             .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
-<<<<<<< HEAD
-=======
-        extensionPackSource
-            .Connect()
-            .Bind(ExtensionPacks)
-            .ObserveOn(SynchronizationContext.Current)
-            .Subscribe();
-
-        var extensionPackExtensionsChangeSet = extensionPackExtensionsSource
-            .Connect()
-            .Transform(ext => new SelectableItem<SavedPackageExtension>(ext))
-            .ObserveOn(SynchronizationContext.Current!)
-            .Publish();
-
-        extensionPackExtensionsChangeSet
-            .AutoRefresh(item => item.IsSelected)
-            .Filter(item => item.IsSelected)
-            .Bind(SelectedExtensionPackExtensions)
-            .ObserveOn(SynchronizationContext.Current)
-            .Subscribe();
-
->>>>>>> 64b44ab1 (Merge pull request #899 from ionite34/observe-on)
         cleanUp = new CompositeDisposable(
             AvailableItemsSearchCollection = new SearchCollection<
                 SelectableItem<PackageExtension>,