From b63768ec3228036d41a8e71bfa9d843d0c7b0aac Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@gopivotal.com>
Date: Fri, 30 Aug 2013 19:05:36 -0400
Subject: [PATCH] INT-2995 Fix Leftover Docbook Conflict Marker

---
 src/reference/docbook/whats-new.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/reference/docbook/whats-new.xml b/src/reference/docbook/whats-new.xml
index ab047bd926..d70f96318d 100644
--- a/src/reference/docbook/whats-new.xml
+++ b/src/reference/docbook/whats-new.xml
@@ -213,7 +213,6 @@
 				For more information see <xref linkend="chain"/>.
 			</para>
 		</section>
-<<<<<<< HEAD
 		<section id="3.0-jms-mdca-te">
 			<title>JMS Message Driven Channel Adapter</title>
 			<para>