fix botched merge conflict resolution
This commit is contained in:
parent
0ffb4576d2
commit
3b727d05ef
@ -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…
x
Reference in New Issue
Block a user