Fix old merge artefact.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 2fa259e611453349ff21fc3833808d84fb911068..bd544227b5dd4a76b767395a59bb23c74a14c640 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2018-04-05  Carl Hetherington  <cth@carlh.net>
 
+       * Updated zh_CN translation from 刘汉源.
+
        * Fix crash on startup if there are no audio devices (#1265).
 
        * Fix non-working arrow keys / space in text fields (#1263).
@@ -4091,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>