From 5c7d811aa68a72cd8336deb2b254198b9dfd6cce Mon Sep 17 00:00:00 2001
From: damianedwards <damian@damianedwards.com>
Date: Wed, 20 May 2015 16:22:54 -0700
Subject: [PATCH] Fix the merge

---
 .../CustomRequestCultureProvider.cs                           | 4 +---
 .../IApplicationBuilderExtensions.cs                          | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs b/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs
index 0bbb94f42b..571a9a0e90 100644
--- a/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs
+++ b/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs
@@ -26,8 +26,6 @@ namespace Microsoft.AspNet.Localization
 
         /// <inheritdoc />
         public override Task<RequestCulture> DetermineRequestCulture([NotNull] HttpContext httpContext)
-        {
-            return _provider(httpContext);
-        }
+            => _provider(httpContext);
     }
 }
diff --git a/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs b/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs
index afa218e30f..fbc6b08cba 100644
--- a/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs
@@ -33,6 +33,7 @@ namespace Microsoft.AspNet.Builder
         /// <returns>The <see cref="IApplicationBuilder"/>.</returns>
         public static IApplicationBuilder UseRequestLocalization(
             [NotNull] this IApplicationBuilder builder,
-            [NotNull] RequestLocalizationOptions options => builder.UseMiddleware<RequestLocalizationMiddleware>(options);
+            [NotNull] RequestLocalizationOptions options)
+            => builder.UseMiddleware<RequestLocalizationMiddleware>(options);
     }
 }
\ No newline at end of file