mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

doc: Remove leftover conflict marker in the docs

Browse source
This commit is contained in:
Christian Decker 2021-03-19 14:44:44 +01:00 • committed by Rusty Russell
parent 19b0ab8403
commit 777f0b1145
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/index.rst
View file

@ -29,9 +29,6 @@ c-lightning Documentation
:maxdepth: 1
:caption: Manpages
<<<<<<< HEAD
=======
>>>>>>> df: add openchannel_abort command
lightning-addgossip <lightning-addgossip.7.md>
lightning-autocleaninvoice <lightning-autocleaninvoice.7.md>
lightning-check <lightning-check.7.md>