From 8a2fde0efdbacf4e695747e1dc111570b0aed7ef Mon Sep 17 00:00:00 2001
From: max_10 <max_10@gmx.de>
Date: Sat, 23 Dec 2017 22:25:50 +0100
Subject: [PATCH] fix merge

---
 ChangeLog | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 ChangeLog

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..e69de29bb