diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2013-12-16 20:03:46 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2013-12-16 20:03:46 +0400 |
| commit | 1f7c19d6fa8409fc9019672a59804605ffead85c (patch) | |
| tree | b37a08ffa2fd3435e0d06a79f018d09dc3b62997 | |
| parent | 843701ac6d7f705655c72e3c0f3a9f7fb0679d55 (diff) | |
one more merge failure fix.
| -rw-r--r-- | Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs index bff74df..854dbaf 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs @@ -13,6 +13,7 @@ using TestMethodAttribute = NUnit.Framework.TestAttribute; using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; #else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif #if STRESS using ReactiveTests.Stress.Schedulers; #endif |