Merge branch 'master' of github.com:Rhizomatica/puppet

Conflicts: modules/rhizo_base/manifests/init.pp
2016-04-28 00:53:20 +01:00 · 2016-04-28 00:53:20 +01:00 · ea22571199
commit ea22571199
parent f55dff631b 4616dfa0a7
1 changed files with 4 additions and 0 deletions
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@ -190,7 +190,11 @@ class rhizo_base {
      ensure   => present,
      provider => git,
      source   => 'https://github.com/Rhizomatica/rccn.git',
+<<<<<<< HEAD
     revision => '1.0.83',
+=======
+     revision => '1.0.82',
+>>>>>>> 4616dfa0a77da734aa897db484684d04fe5b711c
      require  => [ File['/var/rhizomatica'], Package['git'] ],
      notify   => [ Exec['locale-gen'],
                    Exec['restart-freeswitch'],