From e3566bc6cb14a7317d985d762ce30b722848aa97 Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:31:07 +0200
Subject: [PATCH] Merge conflict

---
 web/version.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 web/version.json

diff --git a/web/version.json b/web/version.json
new file mode 100644
index 000000000..e69de29bb