Rebased and fixed conflicts

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/oxidized/model/pfsense.rb b/lib/oxidized/model/pfsense.rb
index 5849160..278a126 100644
--- a/lib/oxidized/model/pfsense.rb
+++ b/lib/oxidized/model/pfsense.rb
@@ -1,20 +1,18 @@
 class PfSense < Oxidized::Model
-
   # use other use than 'admin' user, 'admin' user cannot get ssh/exec. See issue #535
-  
+
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-1].join
   end
-  
+
   cmd 'cat /cf/conf/config.xml' do |cfg|
     cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
     cfg.gsub! /\s<last_rule_upd_time>\d*<\/last_rule_upd_time>/, ''
     cfg
   end
-  
+
   cfg :ssh do
     exec true
     pre_logout 'exit'
   end
- 
 end