From ced5bdfeef32e7a50027774a06446a072ca981db Mon Sep 17 00:00:00 2001
From: Krolaf <jerome@grafitoid.com>
Date: Tue, 22 Oct 2024 07:33:58 +0200
Subject: [PATCH] jerem_modif

---
 Jeremy.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Jeremy.txt b/Jeremy.txt
index d3a63b8..ad4e38e 100644
--- a/Jeremy.txt
+++ b/Jeremy.txt
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
 C'est une bonne situation ça scribe ?
 =======
 poney unijambiste
->>>>>>> 8331ff78dd43c2c192752092ee9a1a70218f6a32