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.rst10
1 files changed, 8 insertions, 2 deletions
diff --git a/docs/development/overview/index.rst b/docs/development/overview/index.rst
index 71bdbf4..97fc100 100644
--- a/docs/development/overview/index.rst
+++ b/docs/development/overview/index.rst
@@ -2,12 +2,18 @@
.. 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::
- :numbered:
- :maxdepth: 2
+ :maxdepth: 4
OPNFV_HA_Guest_APIs-Overview_HLD.rst