From d87789ffa5dea30fe5c1ecd29a779c5a90ee70da Mon Sep 17 00:00:00 2001
From: magikcypress <cyp@rouquin.me>
Date: Sat, 20 May 2017 20:28:11 +0200
Subject: [PATCH] [fix] incorrect merge

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

diff --git a/scripts/install b/scripts/install
index 2a999ca..c3036ab 100644
--- a/scripts/install
+++ b/scripts/install
@@ -41,18 +41,10 @@ ynh_nginx_config
 # Create the php-fpm pool config
 ynh_fpm_config
 
-<<<<<<< HEAD
 # If app is public, add url to SSOWat conf as skipped_uris
 if [[ $is_public -eq 1 ]]; then
   # unprotected_uris allows SSO credentials to be passed anyway.
   ynh_app_setting_set "$app" unprotected_uris "/"
-=======
-# Set ssowat config
-ynh_app_setting_set $app is_public "$is_public"
-if [ "$is_public" = "Yes" ];
-then
-  ynh_app_setting_set $app unprotected_uris "/"
->>>>>>> ed68227b97ca7aa0f4e0d0f9450df936e867585f
 fi
 
 sudo systemctl reload nginx