From b4404c82663ec7cca8c608cbc938d96b81f0be13 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 29 Feb 2016 17:53:59 -0600
Subject: [PATCH] Clean up Release Notes merge

---
 documentation/RELEASE_NOTES.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index 826c64c99..ab16f7dc4 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -57,11 +57,7 @@ back-porting some earlier changes from the 3.15 branch, and fixes
 <a href="https://code.launchpad.net/bugs/1514520">Launchpad bug
 #1514520</a>.</p>
 
-<<<<<<< TREE
-<h3>Fix <tt>ipAddrToAsciiAsync()</tt>: don't try to join the daemon thread</h3>
-=======
-<h3>ipAddrToAsciiAsync.: Don't try to join the daemon thread</h3>
->>>>>>> MERGE-SOURCE
+<h3>Fix <tt>ipAddrToAsciiAsync()</tt>: Don't try to join the daemon thread</h3>
 
 <p>On process exit, don't try to stop the worker thread that makes DNS lookups
 asynchronous. Previously this would wait for any lookups still in progress,