From 6acaa3e0b8219e4a175bc2134be79fc919bcb29c Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko.korhonen@reekynet.com>
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 e69de29..ad869b3 100644
--- a/test
+++ b/test
@@ -0,0 +1 @@
+asdsad