Merge.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 16edf7d3a04fe725e0e025113346a03aac02dd09..e2da549d1ec19360fb6030943ee169a6e4f07665 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
+<<<<<<< HEAD
 2018-03-14  Carl Hetherington  <cth@carlh.net>
+=======
+2018-03-21  Carl Hetherington  <cth@carlh.net>
+
+       * Updated nl_NL translation from Rob van Nieuwkerk.
+
+2018-03-19  Carl Hetherington  <cth@carlh.net>
+>>>>>>> 15f3ff4... Updated nl_NL translation from Rob van Nieuwkerk.
 
        * Better error when loading a non-certificate as a certificate.