From 7e156b4abd2b2cd3f32819df457070cedac7ab69 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Mon, 25 Apr 2016 12:41:54 -0700
Subject: [PATCH] remove extraneous line

---
 docs/Testing/Testing.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/Testing/Testing.md b/docs/Testing/Testing.md
index 3edc4d7780..d322cee698 100644
--- a/docs/Testing/Testing.md
+++ b/docs/Testing/Testing.md
@@ -1,4 +1,3 @@
-<<<<<<< d74cd7b90a57dd043736c99c54f37e417ed3442d
 # DRAFT
 
 _I have more questions than answers_