From 77d9b41e48ecd94b9aac87563cd49af19d7498d4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 2 Sep 2015 17:49:18 -0700 Subject: [PATCH] Fix merge issue --- .../ActionResults/CreatedAtActionResultTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs index 59eb2b0dc3..1c5a6567e9 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs @@ -97,7 +97,6 @@ namespace Microsoft.AspNet.Mvc.ActionResults httpContext.RequestServices = services.Object; var optionsAccessor = new TestOptionsManager(); - var optionsAccessor = new MockMvcOptionsAccessor(); optionsAccessor.Value.OutputFormatters.Add(new StringOutputFormatter()); optionsAccessor.Value.OutputFormatters.Add(new JsonOutputFormatter()); services.Setup(p => p.GetService(typeof(IOptions)))