From ff9a3c0a36c763cc2c209119bacf0138fbc79a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9lian=20PONS?= <kelian.pons@gmail.com>
Date: Tue, 28 Jul 2026 21:24:42 +0200
Subject: [PATCH] feat: adding random char to add merge conflit

---
 README.md | 2 +-
 text.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 02b93f0..2228cd6 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-**Caca**
+**Cacaa**
diff --git a/text.txt b/text.txt
index 5ab935b..014d3e7 100644
--- a/text.txt
+++ b/text.txt
@@ -1 +1 @@
-coucouc est-ce que ça marche*
\ No newline at end of file
+coucouuc est-ce que ça marche*
\ No newline at end of file