fix

bitfoundation · Oct 21, 2024 · 84ff6fe · 84ff6fe
1 parent 7fc8db8
commit 84ff6fe
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 23 deletions.
diff --git a/...oilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthorizedHeader.razor.cs b/...oilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthorizedHeader.razor.cs
@@ -1,10 +1,6 @@
 namespace Boilerplate.Client.Core.Components.Layout;
 
-<<<<<<<< HEAD:src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthenticatedHeader.razor.cs
-public partial class AuthenticatedHeader : AppComponentBase
-========
 public partial class AuthorizedHeader : AppComponentBase
->>>>>>>> 196d1ef14557dc3d723cd6ce6f8c73456bfd7ec4:src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthorizedHeader.razor.cs
 {
     private string? pageTitle;
     private string? pageSubtitle;

diff --git a/....Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.cs b/....Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.cs
@@ -1,6 +1,6 @@
 namespace Boilerplate.Client.Core.Components.Layout;
 
-public partial class UnauthenticatedHeader : AppComponentBase, IDisposable
+public partial class IdentityHeader : AppComponentBase, IDisposable
 {
     private string? backLinkPayload;
     private BitDropdownItem<string>[] cultures = default!;

diff --git a/...oilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss b/...oilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss
@@ -6,10 +6,6 @@ header {
     height: 65px;
     padding: 1rem;
     position: absolute;
-<<<<<<<< HEAD:src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UnauthenticatedHeader.razor.scss
-    height: 65px;
-========
->>>>>>>> 196d1ef14557dc3d723cd6ce6f8c73456bfd7ec4:src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss
     z-index: $bit-zindex-base;
 }
 

diff --git a/...it.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RouteDataPublisher.cs b/...it.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RouteDataPublisher.cs