From 2cbf72995ce53ed92545dbcd3fb07788d68ff7f2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 5 Apr 2018 16:30:51 +0100
Subject: Fix old merge artefact.

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 524b97e0b..bd544227b 100644
--- 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>
 
-- 
cgit v1.2.3