fix merge error

diff --git a/manifests/defines/line.pp b/manifests/defines/line.pp
index bbe0a54fcac80f2ff316a9fe5b6ed1b57d199d0a..44c52a0b16a1fe54e1831764a6b269a037162c45 100644 (file)
--- 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}'" ) }