From f9f3b22858345857df6906916357eb90dbba286c Mon Sep 17 00:00:00 2001
From: John Woodlock <john.woodlock@gmail.com>
Date: Tue, 5 Feb 2013 13:08:01 +0000
Subject: [PATCH] remove bit of merge conflict text

---
 api-docs/apiLive.htm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm
index 19798119a..59ac1f202 100644
--- a/api-docs/apiLive.htm
+++ b/api-docs/apiLive.htm
@@ -4064,7 +4064,6 @@
 				</div>
 			</div>
 
->>>>>>> update api docs format
 		</div>
 		<!-- main-content-wrapper -->