From ce0964bce62d7ad5738cccb1bcc41ca8fbe356de Mon Sep 17 00:00:00 2001
From: root <you@example.com>
Date: Tue, 1 May 2018 12:19:19 +0200
Subject: [PATCH] [enh] Add previous maintainer

---
 manifest.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/manifest.json b/manifest.json
index be59dad..4003e28 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,22 @@
         "name": "beudbeud",
         "email": "beudbeud@beudibox.fr"
     },
+<<<<<<< HEAD
     "multi_instance": "false",
+=======
+    "previous_maintainers": {
+    	"name": "beudbeud",
+    	"email": "beudbeud@beudibox.fr"
+    },
+    "requirements": {
+        "yunohost": ">= 2.7.10"
+    },
+    "multi_instance": true,
+    "services": [
+        "nginx",
+        "mysql"
+    ],
+>>>>>>> [enh] Made this app working
     "arguments": {
         "install" : [
             {