Tag

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