From 7f36259614125ef7c6ff40e66f41e003bf05875d Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 4 Mar 2016 11:36:16 +0000
Subject: [PATCH] Remove excessive blank lines rendered after "Miscellaneous
 settings"

---
 salt/files/master.d/f_defaults.conf | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index 8181e25..0f35b2a 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -1186,49 +1186,49 @@ win_gitrepos:
 {{ get_config('return', '')}}
 
 
-######    Miscellaneous  settings     ######
+######     Miscellaneous settings     ######
 ############################################
 # Default match type for filtering events tags: startswith, endswith, find, regex, fnmatch
 {{ get_config('event_match_type', 'startswith') }}
 
-{% if 'halite' in cfg_master %}
+{%- if 'halite' in cfg_master %}
 #####             Halite             #####
 ##########################################
 halite:
-  {% for name, value in cfg_master['halite'].items() %}
+  {%- for name, value in cfg_master['halite'].items() %}
   {{ name }}: {{ value }}
-  {% endfor %}
-{% endif %}
+  {%- endfor %}
+{%- endif %}
 
-{% if 'rest_cherrypy' in cfg_master %}
+{%- if 'rest_cherrypy' in cfg_master %}
 #####         rest_cherrypy          #####
 ##########################################
 rest_cherrypy:
-  {% for name, value in cfg_master['rest_cherrypy'].items() %}
+  {%- for name, value in cfg_master['rest_cherrypy'].items() %}
   {{ name }}: {{ value }}
   {%- endfor %}
 {%- endif %}
 
-{% if 'rest_tornado' in cfg_master %}
+{%- if 'rest_tornado' in cfg_master %}
 #####         rest_tornado            #####
 ###########################################
 rest_tornado:
-  {% for name, value in cfg_master['rest_tornado'].items() %}
+  {%- for name, value in cfg_master['rest_tornado'].items() %}
   {{ name }}: {{ value }}
   {%- endfor %}
 {%- endif %}
 
-{% if 'presence_events' in cfg_master %}
+{%- if 'presence_events' in cfg_master %}
 #####        presence events         #####
 ##########################################
 {{ get_config('presence_events', 'False') }}
-{% endif %}
+{%- endif %}
 
-{% if 'consul_config' in cfg_master %}
+{%- if 'consul_config' in cfg_master %}
 #####         consul_config          #####
 ##########################################
 consul_config:
-  {% for name, value in cfg_master['consul_config'].items() %}
+  {%- for name, value in cfg_master['consul_config'].items() %}
   {{ name }}: {{ value }}
   {%- endfor %}
 {%- endif %}