Browse Source

fix botched merge conflict resolution

pull/276/head
Thomas Thorburn 3 years ago
parent
commit
3b727d05ef
1 changed files with 0 additions and 1 deletions
  1. +0
    -1
      nginx/servers_config.sls

+ 0
- 1
nginx/servers_config.sls View File

@@ -10,7 +10,6 @@
{% set server_states = [] %}
{#- _nginx is a lightened copy of nginx map intended to passed in templates #}
{%- set _nginx = nginx.copy() %}
{%- do _nginx.pop('snippets') %}
{%- do _nginx.pop('streams') if nginx.streams is defined %}
{%- do _nginx.pop('snippets') if nginx.snippets is defined %}
{%- do _nginx.pop('servers') if nginx.servers is defined %}

Loading…
Cancel
Save