Removed merge conflict in tftp module

2012-11-19 11:06:53 +02:00 · 2012-11-19 11:06:53 +02:00 · 6f1c01ea81
commit 6f1c01ea81
parent be911c1dea
1 changed files with 0 additions and 7 deletions
--- a/tftp/manifests/init.pp
+++ b/tftp/manifests/init.pp
@ -112,14 +112,7 @@ class tftp::server {
            include inetd::server
            inetd::service { "tftp":
                ensure  => present,
-<<<<<<< HEAD
-                require => $::operatingsystem ? {
-                    "openbsd" => undef,
-                    default   => Package["tftp-server"],
-                },
-=======
                require => Package["tftp-server"],
->>>>>>> 7c4f9e6b94793caf3c9369cc0519eefddc54f7d0
            }
        }
    }