change path;clean merge junk (#5719)

dotnet · Mar 16, 2018 · dc49dd5 · dc49dd5
1 parent 03d972e
commit dc49dd5
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/aspnetcore/includes/signalr-version-notice.md b/aspnetcore/includes/signalr-version-notice.md
@@ -1,6 +1,2 @@
 > [!NOTE]
-<<<<<<< HEAD
-> This document details the latest version of ASP.NET Core SignalR. Looking to get started with an earlier version of SignalR? See the [SignalR 1.x documentation](../../aspnet/signalr/).
-=======
-> This document details the latest version of ASP.NET Core SignalR. See the [SignalR 1.x documentation](../../aspnet/signalr/) for the ASP.NET Framework version.
->>>>>>> b4816ac7a33c5632834824a51e47d6c8922099b4
+> This document details the latest version of ASP.NET Core SignalR. See the [SignalR 1.x documentation](/aspnet/signalr/) for the ASP.NET Framework version.