From 092a1b0e962f9a204675e3d47faf7cee94d57c70 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sun, 27 Oct 2019 22:46:39 +0200
Subject: [PATCH] Testing conflict

Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>
---
 test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test b/test
index e69de29b..ad869b38 100644
--- a/test
+++ b/test
@@ -0,0 +1 @@
+asdsad