From 3457521675d7e3df2d432d600a3375fef09332d0 Mon Sep 17 00:00:00 2001
From: Nico Korthout <nicokorthout@gmail.com>
Date: Fri, 10 May 2024 17:17:24 +0200
Subject: [PATCH] Add a change that will conflict

---
 conflict | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflict

diff --git a/conflict b/conflict
new file mode 100644
index 0000000..7cd2517
--- /dev/null
+++ b/conflict
@@ -0,0 +1 @@
+This will conflict