From f6ba9ddb59ec1feabed6a1b4230612bf7f6d3795 Mon Sep 17 00:00:00 2001
From: Erik Johnson <palehose@gmail.com>
Date: Thu, 3 Jul 2014 12:53:13 -0500
Subject: [PATCH] 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.
---
 nginx/ng/map.jinja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja
index 4cb455f..e06ccf8 100644
--- 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({