From 0556fc92a74293dcbeaf8b871ba0078b6b6a2d9a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 17 Mar 2014 00:14:40 +0000
Subject: [PATCH] ChangeLog.

---
 ChangeLog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6783464c6..c4c2c9c63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-17  Carl Hetherington  <cth@carlh.net>
+
+	* Improve appearance of config dialog on OS X.
+
 2014-03-15  Carl Hetherington  <cth@carlh.net>
 
 	* Improve appearance of new film and KDM dialogs on OS X.
@@ -12,7 +16,6 @@
 2014-03-12  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.66.1 released.
->>>>>>> 80faa28d7fd23ad811a9b837622f7e0cff1f2335
 
 2014-03-12  Carl Hetherington  <cth@carlh.net>
 
-- 
2.30.2