diff options
author | Daniil Baturin <daniil@baturin.org> | 2018-08-25 13:21:38 +0200 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2018-08-25 13:21:38 +0200 |
commit | 4e9a68f47bbf507f4d74ee08bc445f8162f40a4c (patch) | |
tree | dde11c06b7f0bc9013cb5e965627c7312988f3d3 /debian | |
parent | c19e5ae5d43fdf9e5e27a2de71f0c1b76846f785 (diff) | |
parent | f9896bb93170c9c68e40b2b40460fb26d9bceb5d (diff) | |
download | vyatta-cfg-quagga-4e9a68f47bbf507f4d74ee08bc445f8162f40a4c.tar.gz vyatta-cfg-quagga-4e9a68f47bbf507f4d74ee08bc445f8162f40a4c.zip |
Merge branch 'current' of https://github.com/vyos/vyatta-cfg-quagga into current
Conflicts:
debian/control
Diffstat (limited to 'debian')
-rw-r--r-- | debian/vyatta-cfg-quagga.install | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/vyatta-cfg-quagga.install b/debian/vyatta-cfg-quagga.install index f6e52ff0..b8b66da3 100644 --- a/debian/vyatta-cfg-quagga.install +++ b/debian/vyatta-cfg-quagga.install @@ -4,7 +4,6 @@ opt/vyatta/etc opt/vyatta/share/perl5 opt/vyatta/share/vyatta-cfg/templates/policy opt/vyatta/share/vyatta-cfg/templates/protocols -opt/vyatta/share/vyatta-cfg/templates/system/gateway-address opt/vyatta/share/vyatta-cfg/templates/interfaces/bonding opt/vyatta/share/vyatta-cfg/templates/interfaces/bridge opt/vyatta/share/vyatta-cfg/templates/interfaces/ethernet |