diff options
author | Marno van der Molen <marnovandermolen@acknowledge.nl> | 2017-05-18 10:25:16 +0200 |
---|---|---|
committer | Marno van der Molen <marnovandermolen@acknowledge.nl> | 2017-05-18 10:25:16 +0200 |
commit | 115f8853dffa1b59912385f5b12f8a1e3a0da52b (patch) | |
tree | b2f890d5ca2fab4490a17ece809fc988ee83266b | |
parent | c718e46be7eecbd098152e29922c42e9f5e148e1 (diff) |
Resolve manual merge issue
-rw-r--r-- | lib/oxidized/model/asa.rb | 6 |
1 files changed, 0 insertions, 6 deletions
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' |