Remove merge argument from pillar.get

This argument is only currently available in develop, and thus does not belong in this formula at this time.
2014-07-03 12:53:13 -05:00 · 2014-07-03 12:53:13 -05:00 · f6ba9ddb59
commit f6ba9ddb59
parent 7febd2deb6
1 changed files with 1 additions and 1 deletions
--- a/nginx/ng/map.jinja
+++ b/nginx/ng/map.jinja
@ -70,7 +70,7 @@
        },
        'managed': {},
    },
-}, merge=True) %}
+}) %}

 {% if 'user' not in nginx.server.config %}
 {% do nginx.server.config.update({