From b31d6065d243b4abe4d34df5601233347cabe51a Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Tue, 23 Jan 2018 00:19:44 +0100
Subject: [PATCH] Fix conflict

---
 community.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/community.json b/community.json
index faebd472..10ae12aa 100644
--- a/community.json
+++ b/community.json
@@ -918,11 +918,12 @@
         "state": "notworking",
         "url": "https://github.com/YunoHost-Apps/pluxml_ynh"
     },
-    "Portainer": {
+    "portainer": {
         "branch": "master",
         "revision": "a7e7e2faa5bc21bd2c2685c958375a05d9ccf70b",
         "state": "inprogress",
         "url": "https://github.com/aymhce/portainer_ynh"
+    },
     "prestashop": {
         "branch": "master",
         "revision": "34b6f2e2f33c528a411a5c1690ad7124c68bb6da",