diff options
| author | Micah Anderson <micah@riseup.net> | 2011-03-25 01:23:45 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-03-25 01:23:45 -0400 |
| commit | 98e0f55b4270af738c9d843866c5c8a4ecd8cdbe (patch) | |
| tree | 312ef035d43bb9563a0e8ea65a12df92a91b2c03 | |
| parent | 233229435f4dacc5c1f14e1756b0d5810448f00c (diff) | |
| download | puppet-common-98e0f55b4270af738c9d843866c5c8a4ecd8cdbe.tar.gz puppet-common-98e0f55b4270af738c9d843866c5c8a4ecd8cdbe.tar.bz2 | |
fix merge error
| -rw-r--r-- | manifests/defines/line.pp | 1 |
1 files changed, 0 insertions, 1 deletions
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}'" ) } |