#529 fixed merge conflicts

ThreeMammals · Aug 12, 2018 · 6e420d0 · 6e420d0
2 parents 2a23bd8 + cbd0af6
commit 6e420d0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Ocelot/DependencyInjection/OcelotAdministrationBuilder.cs b/src/Ocelot/DependencyInjection/OcelotAdministrationBuilder.cs
@@ -1,8 +1,8 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
 namespace Ocelot.DependencyInjection
 {
+    using Microsoft.Extensions.Configuration;
+    using Microsoft.Extensions.DependencyInjection;
+
     public class OcelotAdministrationBuilder : IOcelotAdministrationBuilder
     {
         public IServiceCollection Services { get; }