saltmaster.packages:
  pkg.installed:
    - pkgs:
      - salt-master

git -C /srv/salt pull: #pointless comment
  cron.present:
    - user: root
    - minute: '*/5'

saltmaster.packages:
  pkg.installed:
    - pkgs:
      - salt-master

git -C /srv/salt pull:
  cron.present:
    - user: root
    - minute: '*/5'

Revert "add pointless comment to try post-merge hook"
Revert "add pointless comment to try post-merge hook"

This reverts commit b3adba658ec8a436c569027fd08f4eb3da939356.

sysrich/salt-states