aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrady Johnson <brady.allen.johnson@ericsson.com>2016-09-02 12:58:30 +0200
committerBrady Johnson <brady.allen.johnson@ericsson.com>2016-09-02 11:37:45 +0000
commit7891147ba12fa9595d10aa76c617999392dbe5dd (patch)
treeb386c39cb4b040ede5e598fd2e4f237496b41db2
parenta0e2c1d0cbba861aac0b44bd61beb41ddca70630 (diff)
Fixing problems with merge from previous commit
- Some <<< HEAD tags were left over from a previous merge that wasnt completely resolved. Change-Id: I2dbafdde44a4099f172aecc94ec8dc1435855570 Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com> (cherry picked from commit b1524c428841607007d608dcf925480c68f285ac)
-rw-r--r--docs/installationprocedure/feature.configuration.rst10
1 files changed, 0 insertions, 10 deletions
diff --git a/docs/installationprocedure/feature.configuration.rst b/docs/installationprocedure/feature.configuration.rst
index a5ee416..267efd5 100644
--- a/docs/installationprocedure/feature.configuration.rst
+++ b/docs/installationprocedure/feature.configuration.rst
@@ -2,15 +2,9 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) <optionally add copywriters name>
-<<<<<<< HEAD
-==========================
-Configuration of <feature>
-==========================
-=======
=====================================================
<scenario> installation and configuration instruction
=====================================================
->>>>>>> 78eabe91bc321a8668281f61d6b7930664e5bd8a
Abstract
========
@@ -23,9 +17,5 @@ List the information and activities needed as pre configuration.
Feature configuration
=====================
-<<<<<<< HEAD
-List the steps needed for the configuration of <feature>.
-=======
List the steps needed for the configuration of <feature> and <components> of the scenario.
->>>>>>> 78eabe91bc321a8668281f61d6b7930664e5bd8a