From abf04b0eee37d44367208d054da4ad1bbd48ba5a Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Mon, 17 Apr 2017 00:02:09 +0200
Subject: [PATCH] Clean

---
 scripts/install | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index b0d1251..29eeae0 100644
--- a/scripts/install
+++ b/scripts/install
@@ -207,8 +207,6 @@ sudo yunohost app ssowatconf
 
 # Reload Nginx
 sudo systemctl reload nginx
-<<<<<<< HEAD
-=======
 
 # all services start, please 
 sleep 30
@@ -229,4 +227,3 @@ ACOMMANDS
 
 # Restart crontab
 sudo systemctl restart cron
->>>>>>> refs/remotes/YunoHost-Apps/devel