opuppet/module-common
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix merge error

Browse source
This commit is contained in:
Micah Anderson 2011-03-25 01:23:45 -04:00
parent 233229435f
commit 98e0f55b42
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manifests/defines/line.pp
View file

@ -36,7 +36,6 @@
# #
# Code with fixes gathered at # Code with fixes gathered at
# http://reductivelabs.com/trac/puppet/wiki/Recipes/SimpleText # http://reductivelabs.com/trac/puppet/wiki/Recipes/SimpleText
>>>>>>> sarava/master
define line($file, $line, $ensure = 'present') { define line($file, $line, $ensure = 'present') {
case $ensure { case $ensure {
default : { err ( "unknown ensure value '${ensure}'" ) } default : { err ( "unknown ensure value '${ensure}'" ) }