From e1ada5a0b41bc9b5720c0f1138c48d7e9b827682 Mon Sep 17 00:00:00 2001
From: Federico Brigante <opensource@bfred.it>
Date: Sat, 2 Oct 2021 19:49:26 +0200
Subject: [PATCH] Update conflicting

---
 conflicting | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conflicting b/conflicting
index 8b13789..4c0e7b9 100644
--- a/conflicting
+++ b/conflicting
@@ -1 +1 @@
-
+it's a conflict