From f661c786095e99087773f01351cebe00837f68a7 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 2 Jan 2013 21:13:41 +0100
Subject: cleanup the merge

---
 manifests/signer.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'manifests/signer.pp')

diff --git a/manifests/signer.pp b/manifests/signer.pp
index 350b4be..cfbe46d 100644
--- a/manifests/signer.pp
+++ b/manifests/signer.pp
@@ -1,4 +1,5 @@
-class monkeysphere::signer inherits monkeysphere
-{
+# collect all the host keys
+class monkeysphere::signer {
+  include monkeysphere
   File <<| tag == 'monkeysphere-host' |>>
 }
-- 
cgit v1.2.3