From 09647304c4530a8c14fdd445a5deb208e3f90d42 Mon Sep 17 00:00:00 2001
From: EnolaK <129106977+EnolaK64@users.noreply.github.com>
Date: Thu, 9 May 2024 13:44:33 +0200
Subject: [PATCH 1/2] Update data.json

---
 data.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/data.json b/data.json
index 34d1a75..4d6cba1 100644
--- a/data.json
+++ b/data.json
@@ -389,7 +389,6 @@
         "sucre",
         "veste",
         "plante",
-<<<<<<< HEAD
         "rapide"
     ],
 
@@ -885,4 +884,4 @@
         
 >>>>>>> 1b7a7b9260b283b1952f4f1eda5786cbd668e2c8
     ]
-}
\ No newline at end of file
+}

From 65073b62a79a5a27d408275bd176060e76085f97 Mon Sep 17 00:00:00 2001
From: EnolaK <129106977+EnolaK64@users.noreply.github.com>
Date: Thu, 9 May 2024 13:46:35 +0200
Subject: [PATCH 2/2] fix data.json

---
 data.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/data.json b/data.json
index 4d6cba1..2b5c1a4 100644
--- a/data.json
+++ b/data.json
@@ -835,8 +835,7 @@
         "wonder",
         "worker",
         "writer",
-        "yourself"
-=======
+        "yourself",
         "rapide",
         "aurore",
         "zenith",
@@ -880,8 +879,5 @@
         "ligne",
         "lentement",
         "taille"
-        
-        
->>>>>>> 1b7a7b9260b283b1952f4f1eda5786cbd668e2c8
     ]
 }