diff options
author | Daniil Baturin <daniil@vyos.io> | 2020-05-27 19:31:18 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-27 19:31:18 +0700 |
commit | e57b934644379a81ac76f34c2edb7d3029f8013c (patch) | |
tree | 6d41ffb42aec033adedfe573e5f79cbf7efccd82 /Makefile | |
parent | fbe88e561c69936d67f372d1fab9e55610567fcc (diff) | |
parent | fb23d70afd8386e9c986653436b0caa9d5b6deb0 (diff) | |
download | vyos-1x-e57b934644379a81ac76f34c2edb7d3029f8013c.tar.gz vyos-1x-e57b934644379a81ac76f34c2edb7d3029f8013c.zip |
Merge pull request #435 from sever-sever/T2512-fix
op-mode: T2512: Fix conflict templates ipv4-route and show-ip-route
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions