Fix merge

GuillaumeSalles · Feb 25, 2016 · e95a2a2 · e95a2a2
1 parent 983b82f
commit e95a2a2
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/Redux.Tests/StoreTests.cs b/src/Redux.Tests/StoreTests.cs
@@ -1,11 +1,7 @@
 using NUnit.Core;
-using NUnit.Framework;
-<<<<<<< HEAD
+using NUnit.Framework;
 using System;
-using System.Reactive.Linq;
-=======
-using System.Diagnostics;
->>>>>>> 462fa4ff38f2e35adcc8fff72d8d335737314440
+using System.Reactive.Linq;
 
 namespace Redux.Tests
 {