Merge branch 'macos' of https://github.com/noelmcloughlin/salt-formula into macos

salt/minion.sls

@@ -9,6 +9,7 @@ include:
 
     {%- if grains.os == 'MacOS' %}
         {% if salt_settings.install_packages %}
+
 download-salt-minion:
             {% if salt_settings.salt_minion_pkg_source %} {# minion upgrade? #}
   file.managed:

test/integration/v201902-py3/controls/pkgs_spec.rb

@@ -1,23 +1,5 @@
 # frozen_string_literal: true
 
-<<<<<<< HEAD
-version =
-  case platform[:family]
-  when 'redhat'
-    case platform[:name]
-    when 'amazon'
-      '2019.2.3-1.amzn2'
-    when 'centos'
-      '2019.2.3-1.el8'
-    end
-  when 'suse'
-    '2019.2.0-lp151.5.9.1'
-  when 'debian'
-    '2019.2.3+ds-1'
-  end
-
-=======
->>>>>>> 43dd0c7efc57c6da83477218ba1038bcf42ba945
 control 'salt packages' do
   title 'should be installed'