From 777f0b1145ae87f6bebb7c8c1975a6d90dee2356 Mon Sep 17 00:00:00 2001
From: Christian Decker <decker.christian@gmail.com>
Date: Fri, 19 Mar 2021 14:44:44 +0100
Subject: [PATCH] doc: Remove leftover conflict marker in the docs

---
 doc/index.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/index.rst b/doc/index.rst
index b50e6f92f..d89b01aed 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -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>