From 868b85936f33006a8265b1c001a757f00f583644 Mon Sep 17 00:00:00 2001
From: gitadmin <bonjour@vincent-bonnefille.fr>
Date: Sat, 29 Aug 2026 09:37:00 +0000
Subject: [PATCH] Premier conflit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b840456..6b8d6ea 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-Modification dpuis Gitea !   
\ No newline at end of file
+Conflit depuis Gitea (modification du même fichier que sur le PC)
\ No newline at end of file