From c6c44b682ff0675efa8a806306c5acc525eeb29d Mon Sep 17 00:00:00 2001
From: Keith <keith@rhizomatica.org>
Date: Thu, 28 Apr 2016 00:54:59 +0100
Subject: [PATCH] Tag

---
 modules/rhizo_base/manifests/init.pp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index 74681a8..985f9c9 100644
--- 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'],