summaryrefslogtreecommitdiffstats
path: root/docs/testing/user/userguide/01-introduction.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/testing/user/userguide/01-introduction.rst')
-rwxr-xr-xdocs/testing/user/userguide/01-introduction.rst17
1 files changed, 0 insertions, 17 deletions
diff --git a/docs/testing/user/userguide/01-introduction.rst b/docs/testing/user/userguide/01-introduction.rst
index eaac485..7435746 100755
--- a/docs/testing/user/userguide/01-introduction.rst
+++ b/docs/testing/user/userguide/01-introduction.rst
@@ -10,11 +10,7 @@ Introduction
**Welcome to SampleVNF's documentation !**
.. _Pharos: https://wiki.opnfv.org/display/pharos
-<<<<<<< HEAD
-.. _SampleVNF: https://wiki.opnfv.org/samplevnf
-=======
.. _SampleVNF: https://wiki.opnfv.org/display/SAM
->>>>>>> Jerma documentation rewrite
SampleVNF_ is an OPNFV Project.
@@ -28,11 +24,7 @@ to perform Network Function Virtualization Infrastructure
*SampleVNF* is used in OPNFV for characterization of NFVI on OPNFV infrastructure.
-<<<<<<< HEAD
-.. seealso:: Pharos_ for information on OPNFV community labs
-=======
.. seealso:: 'Pharos'_ for information on OPNFV community labs
->>>>>>> Jerma documentation rewrite
About This Document
@@ -45,15 +37,6 @@ This document consists of the following chapters:
* Chapter :doc:`02-methodology` describes the methodology implemented by the
*SampleVNF* Project for :term:`NFVI` verification.
-<<<<<<< HEAD
-
-* Chapter :doc:`03-installation` provides instructions to install *SampleVNF*.
-
-* Chapter :doc:`05-How_to_run_SampleVNFs` provides example on how installing and running *SampleVNF*.
-
-* Chapter :doc:`06-How_to_use_REST_api` provides info on how to run REST API *SampleVNF*.
-=======
->>>>>>> Jerma documentation rewrite
* Chapter :doc:`03-installation` provides instructions to install *SampleVNF*.