* fixed previous commit

2015-06-30 20:02:15 -07:00 · 2015-06-30 20:02:15 -07:00 · afea3d245e
commit afea3d245e
parent 62ab6a9502
1 changed files with 0 additions and 3 deletions
--- a/nginx/ng/map.jinja
+++ b/nginx/ng/map.jinja
@ -24,10 +24,7 @@
            'vhost_available': '/etc/nginx/conf.d',
            'vhost_enabled': '/etc/nginx/conf.d',
            'vhost_use_symlink': False,
-<<<<<<< HEAD
            'pid_file': '/var/run/nginx.pid',
-=======
->>>>>>>  * added pillar variable to specify os release version for nginx package repo base url for RedHat family os hosts
            'rh_os_releasever': '$releasever',
        },
        'Suse': {