huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor 

Co-Authored-By: Daniel Roth <daroth@microsoft.com>
This commit is contained in:
Isaac Levin 2019-07-01 16:14:19 -04:00 committed by Isaac Levin
parent 8f207cce61
commit 49fe6631b0
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor
View File

@ -1,13 +1,7 @@
<<<<<<< HEAD:src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/NavMenu.razor
<div class="top-row pl-4 navbar navbar-dark">
<a class="navbar-brand" href="">RazorComponentsWeb-CSharp</a>
<button class="navbar-toggler" @onclick="ToggleNavMenu">
=======
<div class="top-row pl-4 navbar navbar-dark"> <div class="top-row pl-4 navbar navbar-dark">
<a class="navbar-brand" href="">BlazorServerWeb-CSharp</a> <a class="navbar-brand" href="">BlazorServerWeb-CSharp</a>
<button class="navbar-toggler" @onclick="@ToggleNavMenu"> <button class="navbar-toggler" @onclick="@ToggleNavMenu">
>>>>>>> Rename RazorComponents template directory to BlazorServer:src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor <span class="navbar-toggler-icon"></span>
<span class="navbar-toggler-icon"></span>
</button> </button>
</div> </div>