INT-2995 Fix Leftover Docbook Conflict Marker

2013-08-30 19:05:36 -04:00
parent 4609b861d1
commit b63768ec32
1 changed files with 0 additions and 1 deletions
--- 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>