summaryrefslogtreecommitdiffstats
path: root/docs/development/overview/index.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/development/overview/index.rst')
-rw-r--r--docs/development/overview/index.rst4
1 files changed, 1 insertions, 3 deletions
diff --git a/docs/development/overview/index.rst b/docs/development/overview/index.rst
index 97fc100..01a8ac9 100644
--- a/docs/development/overview/index.rst
+++ b/docs/development/overview/index.rst
@@ -2,16 +2,14 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) <optionally add copywriters name>
-<<<<<<< HEAD
*********************************
OPNFV HA Guest APIs -- Overview
*********************************
-=======
*********************************************************************
PROPOSAL: Reach-thru Guest Monitoring and Services for High Availability
*********************************************************************
->>>>>>> e83e826... Modify format issues
+
.. toctree::
:maxdepth: 4