diff options
author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:35:44 +0200 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:35:44 +0200 |
commit | c2f8d1a44defeadefcda560ba8a3883e25e24831 (patch) | |
tree | 1eead2a9118b556932ca10e398d8d94f510b70ac /lib/vpnprof/OPMode.pm | |
parent | a88aa2e1a16e1ac1af1fa3b19cb2b88c7783af37 (diff) | |
parent | 9324923d31d389110e2ab882a035982e2b269417 (diff) | |
download | vyatta-op-vpn-lithium.tar.gz vyatta-op-vpn-lithium.zip |
Merge branch 'current' into lithiumlithium
Conflicts:
lib/OPMode.pm
scripts/vyatta-show-ipsec-status.pl
templates/show/vpn/ipsec/sa/node.def
templates/show/vpn/ipsec/sa/peer/node.def
templates/show/vpn/ipsec/status/node.def
Diffstat (limited to 'lib/vpnprof/OPMode.pm')
-rw-r--r-- | lib/vpnprof/OPMode.pm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/vpnprof/OPMode.pm b/lib/vpnprof/OPMode.pm index 99c6268..05e1f00 100644 --- a/lib/vpnprof/OPMode.pm +++ b/lib/vpnprof/OPMode.pm @@ -1,4 +1,3 @@ -#!/usr/bin/perl # # Module Vyatta::vpnprof::OpMode.pm # |