From: Micah Anderson <micah@riseup.net>
Date: Fri, 25 Mar 2011 05:23:45 +0000 (-0400)
Subject: fix merge error
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=98e0f55b4270af738c9d843866c5c8a4ecd8cdbe;p=puppet-common.git

fix merge error
---

diff --git a/manifests/defines/line.pp b/manifests/defines/line.pp
index bbe0a54..44c52a0 100644
--- a/manifests/defines/line.pp
+++ b/manifests/defines/line.pp
@@ -36,7 +36,6 @@
 #
 # Code with fixes gathered at
 # http://reductivelabs.com/trac/puppet/wiki/Recipes/SimpleText
->>>>>>> sarava/master
 define line($file, $line, $ensure = 'present') {
   case $ensure {
     default : { err ( "unknown ensure value '${ensure}'" ) }