From 83d222121cb9e67f4454a8f8c1b10eee0f26e32e Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 3 Jun 2021 11:48:57 +0200
Subject: [PATCH] Fix

---
 pull_request_template.md | 16 ----------------
 scripts/install          | 10 ----------
 scripts/upgrade          | 13 -------------
 3 files changed, 39 deletions(-)
 delete mode 100644 pull_request_template.md

diff --git a/pull_request_template.md b/pull_request_template.md
deleted file mode 100644
index 6c28fc5..0000000
--- a/pull_request_template.md
+++ /dev/null
@@ -1,16 +0,0 @@
-## Problem
-- *Description of why you made this PR*
-
-## Solution
-- *And how do you fix that problem*
-
-## PR Status
-- [ ] Code finished.
-- [ ] Tested with Package_check.
-- [ ] Fix or enhancement tested.
-- [ ] Upgrade from last version tested.
-- [ ] Can be reviewed and tested.
-
-## Package_check results
----
-* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
diff --git a/scripts/install b/scripts/install
index 6941698..e39d3b7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -68,16 +68,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=3
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions to app files
-chmod 750 $final_path
-chown -R www-data: $final_path
-
 #=================================================
 # SETUP SSOWAT
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index e34f5fb..c456ad6 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,19 +84,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 ynh_add_nginx_config
 
 #=================================================
-<<<<<<< Updated upstream
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set right permissions for curl installation
-chmod 750 $final_path
-chown -R www-data: $final_path
-
-#=================================================
-=======
->>>>>>> Stashed changes
 # RELOAD NGINX
 #=================================================
 ynh_script_progression --message="Reloading NGINX web server..." --weight=1