| commit | 4d330a2719fd684739a16c6aa3be6632bc3745a2 | [log] [tgz] |
|---|---|---|
| author | Everton Marques <everton.marques@gmail.com> | Thu Sep 18 12:15:55 2014 -0300 |
| committer | David Lamparter <equinox@opensourcerouting.org> | Wed Feb 04 06:08:00 2015 +0100 |
| tree | 27f4a016f60e238720ace66ea4f9b2ada3bbbfff | |
| parent | a089db4a0678cc1bbbf003bbda2561c03760badc [diff] |
pimd: Remove conflict marker.
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index a5e29dc..984f8d3 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c
@@ -60,7 +60,6 @@ { .fd = -1, .name = "isisd", .flag = VTYSH_ISISD, .path = ISIS_VTYSH_PATH}, { .fd = -1, .name = "babeld", .flag = VTYSH_BABELD, .path = BABEL_VTYSH_PATH}, { .fd = -1, .name = "pimd", .flag = VTYSH_PIMD, .path = PIM_VTYSH_PATH}, ->>>>>>> [pim] pim commands added to vtysh };