From 115f8853dffa1b59912385f5b12f8a1e3a0da52b Mon Sep 17 00:00:00 2001
From: Marno van der Molen <marnovandermolen@acknowledge.nl>
Date: Thu, 18 May 2017 10:25:16 +0200
Subject: Resolve manual merge issue

---
 lib/oxidized/model/asa.rb | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/asa.rb b/lib/oxidized/model/asa.rb
index 8a2ead8..89d8e29 100644
--- a/lib/oxidized/model/asa.rb
+++ b/lib/oxidized/model/asa.rb
@@ -20,12 +20,6 @@ class ASA < Oxidized::Model
     cfg
   end
 
-  cmd :secret do |cfg|
-    cfg.gsub! /enable password (\S+) (.*)/, 'enable password <secret hidden> \2'
-    cfg.gsub! /username (\S+) password (\S+) (.*)/, 'username \1 password <secret hidden> \3'
-    cfg
-  end
-
   # check for multiple contexts
   cmd 'show mode' do |cfg|
     @is_multiple_context = cfg.include? 'multiple'
-- 
cgit v1.2.1