From 4d1a8424c22f9e6f5bdab23428c5eaea9b04e727 Mon Sep 17 00:00:00 2001
From: root <you@example.com>
Date: Tue, 1 May 2018 12:04:21 +0200
Subject: [PATCH] [enh] Made this app working

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

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