From 6f1c01ea81944505a40cc8a36a6f15baa3ccefac Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Mon, 19 Nov 2012 11:06:53 +0200
Subject: [PATCH] Removed merge conflict in tftp module

---
 tftp/manifests/init.pp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tftp/manifests/init.pp b/tftp/manifests/init.pp
index ef5ad52..42f770c 100644
--- 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
             }
         }
     }