From 852cc10e87c876d97ab63863e3e3bc5b284c129b Mon Sep 17 00:00:00 2001
From: CatChow0 <thetrueshibadoggo@gmail.com>
Date: Fri, 14 Nov 2025 11:57:30 +0100
Subject: [PATCH] c pas pt

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

diff --git a/conflict.txt b/conflict.txt
new file mode 100644
index 0000000..b27fa28
--- /dev/null
+++ b/conflict.txt
@@ -0,0 +1 @@
+banane
\ No newline at end of file