From 713bbf6529d3e3bc52bd760b43f9f9c6d6fac043 Mon Sep 17 00:00:00 2001
From: Zeeshan Siddiqui <mzs@microsoft.com>
Date: Tue, 12 Mar 2019 10:18:39 -0700
Subject: [PATCH] merge conflicts.

---
 .../Environment/HostEnvironmentBase.cs               |  2 --
 src/Microsoft.ML.Core/Utilities/Contracts.cs         | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.ML.Core/Environment/HostEnvironmentBase.cs b/src/Microsoft.ML.Core/Environment/HostEnvironmentBase.cs
index ecd8d73725a..abddd0981ce 100644
--- a/src/Microsoft.ML.Core/Environment/HostEnvironmentBase.cs
+++ b/src/Microsoft.ML.Core/Environment/HostEnvironmentBase.cs
@@ -342,8 +342,6 @@ public void RemoveListener(Action<IMessageSource, TMessage> listenerFunc)
 
         protected readonly ProgressReporting.ProgressTracker ProgressTracker;
 
-
-
         public ComponentCatalog ComponentCatalog { get; }
 
         public override int Depth => 0;
diff --git a/src/Microsoft.ML.Core/Utilities/Contracts.cs b/src/Microsoft.ML.Core/Utilities/Contracts.cs
index 076b2d1fa75..8f8ca64420e 100644
--- a/src/Microsoft.ML.Core/Utilities/Contracts.cs
+++ b/src/Microsoft.ML.Core/Utilities/Contracts.cs
@@ -737,12 +737,12 @@ public static void CheckIO(this IExceptionContext ctx, bool f, string msg)
             if (!f)
                 throw ExceptIO(ctx, msg);
         }
-    }
-    public static void CheckIO(this IExceptionContext ctx, bool f, string msg, params object[] args)
-    {
-        if (!f)
-            throw ExceptIO(ctx, msg, args);
-    }
+
+        public static void CheckIO(this IExceptionContext ctx, bool f, string msg, params object[] args)
+        {
+            if (!f)
+                throw ExceptIO(ctx, msg, args);
+        }
 #if !CPUMATH_INFRASTRUCTURE
     /// <summary>
     /// Check state of the host and throw exception if host marked to stop all exection.