From ba0ca37ed93affe7d67b6414f4c7f64b548859b3 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Thu, 6 Jul 2017 20:55:21 +0200 Subject: [PATCH] Oups, PR conflict here ! 2 PR at the same time, and we have duplicated this include. To works fine, this include need to be at the end of the file. - [ ] Complete test - [ ] Upgrade previous version - [ ] Code review - [ ] Approval (LGTM) - [ ] Approval (LGTM) - [ ] CI succeeded [Minor decision](https://github.com/YunoHost/project-organization/blob/master/yunohost_project_organization.md#minor-decision), close on 13 of july, or 9 of july. --- conf/nginx.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index f70ae08..f963f89 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,9 +5,6 @@ location __PATH__ { rewrite ^ https://$server_name$request_uri? permanent; } try_files $uri @searx; - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; } location @searx {