From 85fa15419d791e6eb251c25e013b75c4aef0206d Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Sat, 15 Sep 2018 08:17:53 +1200
Subject: [PATCH] Fix merge (#796)

---
 .../DefaultLinkGeneratorTest.cs                               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Routing.Tests/DefaultLinkGeneratorTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/DefaultLinkGeneratorTest.cs
index d9c9f69e19..c02aec833a 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/DefaultLinkGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/DefaultLinkGeneratorTest.cs
@@ -179,7 +179,7 @@ namespace Microsoft.AspNetCore.Routing
             var routeOptions = new RouteOptions();
             routeOptions.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer);
 
-            var linkGenerator = CreateLinkGenerator(routeOptions: routeOptions, services: null, endpoint1, endpoint2);
+            var linkGenerator = CreateLinkGenerator(routeOptions: routeOptions, configureServices: null, endpoint1, endpoint2);
 
             // Act
             var path = linkGenerator.GetPathByAddress(
@@ -200,7 +200,7 @@ namespace Microsoft.AspNetCore.Routing
             var routeOptions = new RouteOptions();
             routeOptions.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer);
 
-            var linkGenerator = CreateLinkGenerator(routeOptions: routeOptions, services: null, endpoint1, endpoint2);
+            var linkGenerator = CreateLinkGenerator(routeOptions: routeOptions, configureServices: null, endpoint1, endpoint2);
 
             // Act
             var path = linkGenerator.GetPathByAddress(