From 7a230aaff52e4f8b8a6dc44938b161854d9b0344 Mon Sep 17 00:00:00 2001 From: Jesper Brix Rosenkilde Date: Thu, 26 Mar 2020 08:57:53 +0100 Subject: [PATCH] Fix RuboCop offence --- lib/puppet/provider/firewall/iptables.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/puppet/provider/firewall/iptables.rb b/lib/puppet/provider/firewall/iptables.rb index 580d565..90e0910 100644 --- a/lib/puppet/provider/firewall/iptables.rb +++ b/lib/puppet/provider/firewall/iptables.rb @@ -348,12 +348,8 @@ Puppet::Type.type(:firewall).provide :iptables, parent: Puppet::Provider::Firewa :month_days, :week_days, :date_start, :date_stop, :time_contiguous, :kernel_timezone, :src_cc, :dst_cc, :hashlimit_upto, :hashlimit_above, :hashlimit_name, :hashlimit_burst, :hashlimit_mode, :hashlimit_srcmask, :hashlimit_dstmask, :hashlimit_htable_size, -<<<<<<< HEAD :hashlimit_htable_max, :hashlimit_htable_expire, :hashlimit_htable_gcinterval, :bytecode, :ipvs, :zone, :helper, :cgroup, - :rpfilter, :name -======= :hashlimit_htable_max, :hashlimit_htable_expire, :hashlimit_htable_gcinterval, :bytecode, :ipvs, :zone, :helper, :rpfilter, :name, :notrack, ->>>>>>> 6124426... Add --notrack flag ] def insert -- 2.45.2