summaryrefslogtreecommitdiffstats
path: root/docs/scenarios/index.rst
diff options
context:
space:
mode:
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