From 664f8e3bf8a9ad8e3e1c316bca6b07caa8658b7d Mon Sep 17 00:00:00 2001
From: Shadow15510 <antoine.royer31@orange.fr>
Date: Fri, 4 Jun 2021 16:35:37 +0200
Subject: [PATCH] Version 1.2.1

---
 src/main.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main.c b/src/main.c
index 31637b6..8adeb4b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,10 +1,6 @@
 /*
   Project name ......: Plague
-<<<<<<< HEAD
   Version ...........: 1.2.1
-=======
-  Version ...........: 1.2
->>>>>>> 495d11fabf82a4924f31a1eaf183f97b3cf4fd02
   Last modification .: 4 June 2021
 
   code and assets provided with licence :