From ba2b6e41e1b881150329725842d9bee56dbfb938 Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Thu, 27 Feb 2020 10:38:47 +0100
Subject: [PATCH] Log change

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a715533bac..0b863c3b5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Modification for mercurial repositories with enabled XSRF protection
+- Does not throw NullPointerException when merge fails without normal merge conflicts
 
 ### Removed
 - Enunciate rest documentation