From a4343f0b9992f08053e3ccd170310dffd2487fce Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sun, 27 Oct 2019 22:49:26 +0200
Subject: [PATCH] Testing conflict again

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

diff --git a/test b/test
index ad869b3..f1a43f5 100644
--- a/test
+++ b/test
@@ -1 +1,2 @@
 asdsad
+conflictss