* fixed previous commit

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': {