This commit is contained in:
Isaac Levin 2019-07-11 13:14:53 -04:00
parent fba8683719
commit 320c08cd86
4 changed files with 3 additions and 12 deletions

View File

@ -1,4 +1,4 @@
@using System.Net.Http
@using System.Net.Http
@using Microsoft.AspNetCore.Components.Forms
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.JSInterop

View File

@ -1,10 +1,6 @@
<<<<<<< HEAD:src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor
@page "/fetchdata"
@using RazorComponentsWeb_CSharp.Data
=======
@page "/fetchdata"
@using BlazorServerWeb_CSharp.Data
>>>>>>> Rename RazorComponents template directory to BlazorServer:src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor
@inject WeatherForecastService ForecastService
<h1>Weather forecast</h1>

View File

@ -1,10 +1,5 @@
<<<<<<< HEAD:src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/_Host.cshtml
@page "/"
@namespace RazorComponentsWeb_CSharp.Pages
=======
@page "/"
@namespace BlazorServerWeb_CSharp.Pages
>>>>>>> Rename RazorComponents template directory to BlazorServer:src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
<!DOCTYPE html>

View File

@ -1,4 +1,4 @@
<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>
<button class="navbar-toggler" @onclick="ToggleNavMenu">
<span class="navbar-toggler-icon"></span>