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.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/scenarios/index.rst b/docs/scenarios/index.rst
index 24e6b3d..f299246 100644
--- a/docs/scenarios/index.rst
+++ b/docs/scenarios/index.rst
@@ -1,5 +1,6 @@
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
.. OPNFV Release Engineering documentation, created by
sphinx-quickstart on Tue Jun 9 19:12:31 2015.
@@ -20,6 +21,11 @@ Gap Analysis of High Availability
.. 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