summaryrefslogtreecommitdiff
path: root/data/templates/mpls/ldpd.frr.tmpl
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-07 11:24:51 +0200
committerGitHub <noreply@github.com>2020-04-07 11:24:51 +0200
commit8cc6bd529c76c2958999dcc379c418d748181731 (patch)
treeeba1fc570ee7bbf8f32c257c0289f6cc59d991be /data/templates/mpls/ldpd.frr.tmpl
parent09ad28b28c9ebd9308cfe9048686b3b0ef9cfd9c (diff)
parentf52c3b345be8e5aa1af8bdebcc70c852bb320568 (diff)
downloadvyos-1x-8cc6bd529c76c2958999dcc379c418d748181731.tar.gz
vyos-1x-8cc6bd529c76c2958999dcc379c418d748181731.zip
Merge pull request #308 from thomas-mangin/T2226-merge
util: T2226: fix merge conflict
Diffstat (limited to 'data/templates/mpls/ldpd.frr.tmpl')
0 files changed, 0 insertions, 0 deletions