From 4afe5ffc1c81dd8843e41c56c6ff0beac4e9fe69 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Thu, 2 Jul 2020 18:24:15 +0200
Subject: [PATCH] merge fix

---
 src/util.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util.cpp b/src/util.cpp
index b11551c6..f194f53f 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -442,6 +442,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
         "<p>Peter L. Jones (<a href=""https://github.com/pljones"">pljones</a>)</p>"
         "<p>Jonathan Baker-Bates (<a href=""https://github.com/gilgongo"">gilgongo</a>)</p>"
         "<p>Daniele Masato (<a href=""https://github.com/doloopuntil"">doloopuntil</a>)</p>"
+        "<p>Martin Schilde (<a href=""https://github.com/geheimerEichkater"">geheimerEichkater</a>)</p>"
         "<p>Simon Tomlinson (<a href=""https://github.com/sthenos"">sthenos</a>)</p>"
         "<p>Marc jr. Landolt (<a href=""https://github.com/braindef"">braindef</a>)</p>"
         "<p>Olivier Humbert (<a href=""https://github.com/trebmuh"">trebmuh</a>)</p>"