From 6b63e94a4a900858c3656360c991eea6ddff164e Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 25 May 2021 10:36:14 +0200
Subject: [PATCH] Fix

---
 manifest.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index a2857f6..0002260 100644
--- a/manifest.json
+++ b/manifest.json
@@ -71,10 +71,7 @@
             {
                 "name": "group_description",
                 "type": "string",
-<<<<<<< HEAD
                 "optional": true,
-=======
->>>>>>> parent of 4342431 (Cleaning up)
                 "ask": {
                     "en": "Choose a description for the group you want to create",
                     "fr": "Décrivez le groupe que vous souhaitez créer"