From b784e7c243c62ff403d8b46b27c2881025819bad Mon Sep 17 00:00:00 2001
From: Pedre Gabriel <gabriel.pedre974@gmail.com>
Date: Tue, 22 Oct 2024 09:51:10 +0400
Subject: [PATCH] resolutionconflit

---
 Gabriel.txt.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gabriel.txt.txt b/Gabriel.txt.txt
index a680d22..09d4d22 100644
--- a/Gabriel.txt.txt
+++ b/Gabriel.txt.txt
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
 LA KPOP C'EST NUL
-=======
 cours github expernet
->>>>>>> 8331ff78dd43c2c192752092ee9a1a70218f6a32
+