fix merge error

diff --git a/manifests/defines/line.pp b/manifests/defines/line.pp
index bbe0a54..44c52a0 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}'" ) }