From 042ccde35bb4eebf1bddee0c3bd18625537cd7c4 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Thu, 13 Apr 2017 21:47:45 +0200
Subject: [PATCH] Clean

---
 scripts/install | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/scripts/install b/scripts/install
index aa60d97..d88984a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -194,21 +194,6 @@ sudo yunohost service add mastodon-web
 sudo yunohost service add mastodon-sidekiq
 sudo yunohost service add mastodon-streaming
 
-<<<<<<< HEAD
-# restart 1
-# sudo systemctl restart mastodon-*
-
-# Re-Install bundle WHY ???
-sudo su - $app <<MCOMMANDS
-# cd live
-bundle install
-MCOMMANDS
-
-# restart 2
-sudo systemctl restart mastodon-*.service
-
-=======
->>>>>>> refs/remotes/magikcypress/master
 # Copy nginx config
 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 sudo sed -i "s@__PATH__@$path@g" /etc/nginx/conf.d/$domain.d/$app.conf
@@ -235,4 +220,4 @@ fi
 sudo yunohost app ssowatconf
 
 # Reload Nginx
-sudo systemctl reload nginx
\ No newline at end of file
+sudo systemctl reload nginx