From 8e60c04b2acb80fd9517873563207c03bb31c6e3 Mon Sep 17 00:00:00 2001
From: Toto <git.demo@gmail.com>
Date: Thu, 16 Feb 2023 15:09:02 +0100
Subject: [PATCH] Create a file to do conflict

---
 fichier_conflit.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fichier_conflit.txt

diff --git a/fichier_conflit.txt b/fichier_conflit.txt
new file mode 100644
index 0000000..76e579a
--- /dev/null
+++ b/fichier_conflit.txt
@@ -0,0 +1,2 @@
+test
+