HWHOOPS! Remove merge markers

haacked · haacked · commit 315c01fd9666 · 2013-09-06T22:40:50.000-07:00
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()
 		{

Original file line number	Diff line number	Diff line change
`@@ -632,8 +632,6 @@ public void Can_Deserialize_To_Dictionary_String_String_With_Dynamic_Values ()`
`632`	`632`	`Assert.Equal ("{\"Name\":\"ThingBlue\",\"Color\":\"Blue\"}", bd["ThingBlue"]);`
`633`	`633`	`}`
`634`	`634`
`635`		`-<<<<<<< HEAD`
`636`		`-<<<<<<< HEAD`
`637`	`635`	`[Fact]`
`638`	`636`	`public void Can_Deserialize_Decimal_With_Four_Zeros_After_Floating_Point()`
`639`	`637`	`{`