diff options
Diffstat (limited to 'docs/userguide')
| -rw-r--r-- | docs/userguide/index.rst | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst index 7dc7811..1900322 100644 --- a/docs/userguide/index.rst +++ b/docs/userguide/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 -HA Deployment Framework Guideline -======================================= -======= -.. 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 + ********************************* HA Deployment Framework Guideline @@ -36,15 +12,3 @@ HA Deployment Framework Guideline :maxdepth: 4 Deployment_Guideline.rst -<<<<<<< HEAD -======= - -Indices and tables -================== - -* :ref:`search` - -Revision: _sha1_ - -Build date: |today| ->>>>>>> 011d936... Update the docs folder |