From 3b727d05ef53079c89bed51facbc534a138ebd84 Mon Sep 17 00:00:00 2001 From: Thomas Thorburn Date: Mon, 12 Jul 2021 15:30:02 +0200 Subject: [PATCH] fix botched merge conflict resolution --- nginx/servers_config.sls | 1 - 1 file changed, 1 deletion(-) diff --git a/nginx/servers_config.sls b/nginx/servers_config.sls index 7d77987..0b1a4f1 100644 --- a/nginx/servers_config.sls +++ b/nginx/servers_config.sls @@ -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 %}