Merge branch 'master' of https://github.com/saltstack-formulas/salt-formula

salt/files/minion

@@ -17,7 +17,7 @@
 # Per default the minion will automatically include all config files
 # from minion.d/*.conf (minion.d is a directory in the same directory
 # as the main minion config file).
-{{ get_config('default_include', 'master.d/*.conf') }}
+{{ get_config('default_include', 'minion.d/*.conf') }}
 
 # Set the location of the salt master server, if the master server cannot be
 # resolved, then the minion will fail to start.