diff options
Diffstat (limited to 'manifests/defines/line.pp')
| -rw-r--r-- | manifests/defines/line.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/defines/line.pp b/manifests/defines/line.pp index 44c52a0..bbe0a54 100644 --- a/manifests/defines/line.pp +++ b/manifests/defines/line.pp @@ -36,6 +36,7 @@ # # 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}'" ) } |