Merge branch 'master' into dev

akkadotnet · Feb 21, 2018 · ec7884c · ec7884c
2 parents 3f0c716 + 531527a
commit ec7884c
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/src/core/Akka.Tests.Shared.Internals/AsyncContext/AsyncContext.SynchronizationContext.cs b/src/core/Akka.Tests.Shared.Internals/AsyncContext/AsyncContext.SynchronizationContext.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using Nito.AsyncEx.Synchronous;
 
@@ -112,4 +112,4 @@ public override bool Equals(object obj)
             }
         }
     }
-}
+}
diff --git a/src/core/Akka.Tests.Shared.Internals/AsyncContext/AsyncContext.TaskQueue.cs b/src/core/Akka.Tests.Shared.Internals/AsyncContext/AsyncContext.TaskQueue.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading.Tasks;

diff --git a/src/core/Akka.Tests.Shared.Internals/AsyncContext/AsyncContext.TaskScheduler.cs b/src/core/Akka.Tests.Shared.Internals/AsyncContext/AsyncContext.TaskScheduler.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Nito.AsyncEx

diff --git a/src/core/Akka.Tests.Shared.Internals/AsyncContext/AsyncContext.cs b/src/core/Akka.Tests.Shared.Internals/AsyncContext/AsyncContext.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
@@ -250,4 +250,4 @@ public DebugView(AsyncContext context)
             public TaskScheduler TaskScheduler => _context._taskScheduler;
         }
     }
-}
+}
diff --git a/src/core/Akka.Tests.Shared.Internals/AsyncContext/BoundAction.cs b/src/core/Akka.Tests.Shared.Internals/AsyncContext/BoundAction.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;

diff --git a/src/core/Akka.Tests.Shared.Internals/AsyncContext/ExceptionHelpers.cs b/src/core/Akka.Tests.Shared.Internals/AsyncContext/ExceptionHelpers.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Runtime.ExceptionServices;
 
 internal static class ExceptionHelpers

diff --git a/src/core/Akka.Tests.Shared.Internals/AsyncContext/SingleDisposable (of T).cs b/src/core/Akka.Tests.Shared.Internals/AsyncContext/SingleDisposable (of T).cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using Nito.Disposables.Internals;
 

diff --git a/src/core/Akka.Tests.Shared.Internals/AsyncContext/SynchronizationContextSwitcher.cs b/src/core/Akka.Tests.Shared.Internals/AsyncContext/SynchronizationContextSwitcher.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/src/core/Akka.Tests.Shared.Internals/AsyncContext/SynchronousTaskExtensions.cs.cs b/src/core/Akka.Tests.Shared.Internals/AsyncContext/SynchronousTaskExtensions.cs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Runtime.ExceptionServices;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/src/core/Akka/Util/Internal/SynchronizationContextManager.cs b/src/core/Akka/Util/Internal/SynchronizationContextManager.cs
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
 // <copyright file="SynchronizationContextManager.cs" company="Akka.NET Project">
 //     Copyright (C) 2009-2018 Lightbend Inc. <http://www.lightbend.com>
 //     Copyright (C) 2013-2018 .NET Foundation <https://github.com/akkadotnet/akka.net>