summaryrefslogtreecommitdiffstats
path: root/docs/scenarios/index.rst
diff options
context:
space:
mode:
authorSofia Wallin <sofia.wallin@ericsson.com>2016-10-25 15:29:23 +0200
committerfuqiao <fuqiao@chinamobile.com>2017-01-06 15:09:39 +0800
commitc60a7eeb5ce9974da87a1188834c8a35d8f83124 (patch)
tree8cf8b12c2f6a64dc61969707a5da8992e9f76c09 /docs/scenarios/index.rst
parentd277b81849655402ed050bd67be8a960de2d1d51 (diff)
Documentation updatestable/colorado
Index files updated to enable correct documentation rendering. JIRA: DOCS-85 Change-Id: Iec6d7e672a058804f02ca9f3cdc4a83e1885e826 Signed-off-by: fuqiao@chinamobile.com
Diffstat (limited to 'docs/scenarios/index.rst')
-rw-r--r--docs/scenarios/index.rst37
1 files changed, 1 insertions, 36 deletions
diff --git a/docs/scenarios/index.rst b/docs/scenarios/index.rst
index f299246..d8a86b0 100644
--- a/docs/scenarios/index.rst
+++ b/docs/scenarios/index.rst
@@ -1,31 +1,7 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-.. OPNFV Release Engineering documentation, created by
- sphinx-quickstart on Tue Jun 9 19:12:31 2015.
- You can adapt this file completely to your liking, but it should at least
- contain the root `toctree` directive.
-
-.. image:: ../etc/opnfv-logo.png
- :height: 40
- :width: 200
- :alt: OPNFV
- :align: left
-
->>>>>>> 011d936... Update the docs folder
-Gap Analysis of High Availability
-=======================================
-=======
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. (c) <optionally add copywriters name>
->>>>>>> 593ef4f... Documentation update
-=======
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
.. http://creativecommons.org/licenses/by/4.0
.. (c) <optionally add copywriters name>
->>>>>>> 593ef4f... Documentation update
+
*********************************
Gap Analysis of High Availability
@@ -36,15 +12,4 @@ Gap Analysis of High Availability
:maxdepth: 4
GAP_Analysis_Colorado.rst
-<<<<<<< HEAD
-=======
-
-Indices and tables
-==================
-
-* :ref:`search`
-
-Revision: _sha1_
-Build date: |today|
->>>>>>> 011d936... Update the docs folder