merge conflicts.

dotnet · Mar 12, 2019 · 713bbf6 · 713bbf6
1 parent 225cad9
commit 713bbf6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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.