# Conflicts: # RBLNews.Maui/MauiProgram.cs # RBLNews.Shared/Components/Pages/Home.razor # RBLNews.Shared/RBLNews.Shared.csproj # RBLNews.Shared/_Imports.razor # RBLNews.Web/Components/App.razor # RBLNews.Web/Components/_Imports.razor # RBLNews.Web/Program.cs
9 lines
216 B
Plaintext
9 lines
216 B
Plaintext
<<<<<<< HEAD
|
|
@using Microsoft.AspNetCore.Components.Web
|
|
=======
|
|
@* ANT CSS DESIGN IMPORT -------------------- *@
|
|
@using BlazorBootstrap;
|
|
|
|
@using Microsoft.AspNetCore.Components.Web
|
|
>>>>>>> css_bootstrap_blazor
|