From b08f959aa17f05821a6a4a58266b9250cdc59cbb Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 6 Nov 2012 11:14:28 +0100
Subject: fixed unseen merge conflicts

---
 puppet/modules/site_shorewall/manifests/eip.pp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/puppet/modules/site_shorewall/manifests/eip.pp b/puppet/modules/site_shorewall/manifests/eip.pp
index 7dee6b7a..20e22cb3 100644
--- a/puppet/modules/site_shorewall/manifests/eip.pp
+++ b/puppet/modules/site_shorewall/manifests/eip.pp
@@ -75,9 +75,6 @@ PARAM   -       -       udp     1194
         action      => 'Ping(ACCEPT)',
         order       => 200;
 
-<<<<<<< HEAD
-      'net2fw-openvpn_ssh':
-=======
       # outside to server
       'net2fw-ssh':
         source      => 'net',
@@ -85,7 +82,6 @@ PARAM   -       -       udp     1194
         action      => 'SSH(ACCEPT)',
         order       => 200;
       'net2fw-openvpn':
->>>>>>> feature/couchdb
         source      => 'net',
         destination => '$FW',
         action      => 'leap_eip(ACCEPT)',
@@ -108,14 +104,9 @@ PARAM   -       -       udp     1194
         action      => 'Git(ACCEPT)',
         order       => 200;
 
-<<<<<<< HEAD
-      #'eip2fw-https':
-      #  source      => 'eip',
-=======
       # Webfrontend is running on another server
       #'eip2fw-https':
-      # source      => 'eip',
->>>>>>> feature/couchdb
+      #  source      => 'eip',
       #  destination => '$FW',
       #  action      => 'HTTPS(ACCEPT)',
       #  order       => 200;
-- 
cgit v1.2.3