HWHOOPS! Remove merge markers

restsharp · Sep 7, 2013 · 315c01f · 315c01f
1 parent 06f1d50
commit 315c01f
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/RestSharp.Tests/JsonTests.cs b/RestSharp.Tests/JsonTests.cs
@@ -632,8 +632,6 @@ public void Can_Deserialize_To_Dictionary_String_String_With_Dynamic_Values ()
 			Assert.Equal ("{\"Name\":\"ThingBlue\",\"Color\":\"Blue\"}", bd["ThingBlue"]);
 		}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 		[Fact]
 		public void Can_Deserialize_Decimal_With_Four_Zeros_After_Floating_Point()
 		{