fix botched merge conflict resolution

This commit is contained in:
Thomas Thorburn 2021-07-12 15:30:02 +02:00
parent 0ffb4576d2
commit 3b727d05ef

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 %}