diff options
Diffstat (limited to 'docs/installationprocedure/feature.configuration.rst')
| -rw-r--r-- | docs/installationprocedure/feature.configuration.rst | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/docs/installationprocedure/feature.configuration.rst b/docs/installationprocedure/feature.configuration.rst index a5ee416e..267efd5c 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 |