From 1bc7462ca7d8260a20aa7ca45172792c60e9b5fa Mon Sep 17 00:00:00 2001
From: Jeremie Dimino <jeremie@dimino.org>
Date: Thu, 1 Mar 2018 23:41:46 +0000
Subject: [PATCH] Update changelog

---
 CHANGES.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 73a41bc1..b022f296 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+next
+----
+
+- Ignore errors during the generation of the .merlin (#569, fixes #568 and #51)
+
 1.0+beta18 (25/02/2018)
 -----------------------