From d6aa1fd095aad4d30eec498cd3956ce266e09b15 Mon Sep 17 00:00:00 2001
From: Toto <git.demo@gmail.com>
Date: Thu, 16 Feb 2023 15:20:36 +0100
Subject: [PATCH] I want to have a conflict !

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 6550605..0259b7d 100644
--- a/main.c
+++ b/main.c
@@ -9,5 +9,5 @@ int main() {
 }
 
 int f() {
-	printf("Patate");
+	printf("Chou fleur");
 }