tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed merge conflict in tftp module

Browse source
This commit is contained in:
Ossi Salmi 2012-11-19 11:06:53 +02:00
parent be911c1dea
commit 6f1c01ea81
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tftp/manifests/init.pp
View file

@ -112,14 +112,7 @@ class tftp::server {
include inetd::server include inetd::server
inetd::service { "tftp": inetd::service { "tftp":
ensure => present, ensure => present,
<<<<<<< HEAD
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["tftp-server"],
},
=======
require => Package["tftp-server"], require => Package["tftp-server"],
>>>>>>> 7c4f9e6b94793caf3c9369cc0519eefddc54f7d0
} }
} }
} }