Fix old merge artefact.

diff --git a/ChangeLog b/ChangeLog
index 524b97e0bf331dbd17776b1e0275f1833e230a15..bd544227b5dd4a76b767395a59bb23c74a14c640 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4093,7 +4093,6 @@
        * Attempt to fix random crashes on OS X (especially during encodes)
        thought to be caused by multiple threads using (different) stringstreams
        at the same time; see src/lib/safe_stringstream.
->>>>>>> origin/master
 
 2014-08-09  Carl Hetherington  <cth@carlh.net>