search

Orange-OpenSource / bagpipe-bgp

**** Now moved to openstack/networking-bagpipe (but still usable standalone without other openstack components) ****
https://docs.openstack.org/developer/networking-bagpipe/
Other
88 stars 28 forks source link

Remnants of a merge conflict in rest_attach.py #13

Closed lukehinds closed 7 years ago

lukehinds commented 7 years ago

A leftover merge conflict pointer (<<<<<<< HEAD) can seen on lines 291 - 297

https://github.com/Orange-OpenSource/bagpipe-bgp/blob/master/bagpipe/bgp/cli/rest_attach.py#L291

I have not made a push, as I am not sure which code is better to keep.

tmmorin commented 7 years ago

Thanks Luke!