Fix for merge conflict problems

JasperFx · Nov 9, 2023 · 547ec58 · 547ec58
1 parent d9e2a84
commit 547ec58
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/src/Http/Wolverine.Http/HttpGraph.ParameterMatching.cs b/src/Http/Wolverine.Http/HttpGraph.ParameterMatching.cs
@@ -7,10 +7,7 @@ public partial class HttpGraph
 {
     private readonly List<IParameterStrategy> _strategies = new()
     {
-<<<<<<< HEAD
-=======
         new FromFileStrategy(),
->>>>>>> alistair-file_upload_support
         new HttpChainParameterAttributeStrategy(),
         new FromServicesParameterStrategy(),
         new MessageBusStrategy(),

diff --git a/src/Persistence/Wolverine.Marten/PublishIncomingEventsBeforeCommit.cs b/src/Persistence/Wolverine.Marten/PublishIncomingEventsBeforeCommit.cs
@@ -24,7 +24,3 @@ public override async Task BeforeSaveChangesAsync(IDocumentSession session, Canc
     }
 }
 
-internal interface IMartenEventPublisher
-{
-    ValueTask PublishAsync(IEnumerable<IEvent> events, IMessageBus bus);
-}
-Original file line number
+Diff line change
@@ Expand Up @@
         }
     }
-    internal interface IMartenEventPublisher
-    {
-        ValueTask PublishAsync(IEnumerable<IEvent> events, IMessageBus bus);
-    }