Skip to content

Commit

Permalink
Reformat merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
stsrki committed Feb 24, 2024
1 parent 2c7cf49 commit b966d7f
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions Source/Blazorise/Services/ModalService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,18 @@ public Task Hide()
public Task Hide( ModalInstance modalInstance )
=> ModalProvider.Hide( modalInstance );

/// <inheritdoc/>
public IEnumerable<ModalInstance> GetInstances()
=> ModalProvider.GetInstances();

/// <inheritdoc/>
public Task Reset()
=> ModalProvider.Reset();

/// <inheritdoc/>
public Task Remove( ModalInstance modalInstance )
=> ModalProvider.Remove( modalInstance );

private static RenderFragment BuildParameterfulContent( Type componentType, Dictionary<string, object> componentParameters )
{
return new RenderFragment( __builder =>
Expand Down Expand Up @@ -127,16 +139,4 @@ private static RenderFragment BuildParameterfulContent<TComponent>( Action<Modal
__builder.CloseComponent();
} );
}

/// <inheritdoc/>
public IEnumerable<ModalInstance> GetInstances()
=> ModalProvider.GetInstances();

/// <inheritdoc/>
public Task Reset()
=> ModalProvider.Reset();

/// <inheritdoc/>
public Task Remove( ModalInstance modalInstance )
=> ModalProvider.Remove( modalInstance );
}

0 comments on commit b966d7f

Please sign in to comment.