Merge branch 'main' into dev

csharpfritz · web-flow · commit 7eb995fd1dc0 · 2020-08-02T12:29:13.000-04:00
diff --git a/BlazorMeetsWebForms.sln b/BlazorMeetsWebForms.sln
@@ -149,4 +149,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E288F9FB-039F-4718-8AEB-85F89B29EB4E}
 	EndGlobalSection
-EndGlobal
+EndGlobal
diff --git a/samples/AfterBlazorServerSide/Shared/NavMenu.razor b/samples/AfterBlazorServerSide/Shared/NavMenu.razor
@@ -113,4 +113,4 @@
     {
         collapseNavMenu = !collapseNavMenu;
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -113,4 +113,4 @@`
`113`	`113`	`{`
`114`	`114`	`collapseNavMenu = !collapseNavMenu;`
`115`	`115`	`}`
`116`		`-}`
	`116`	`+}`