summaryrefslogtreecommitdiffstats
path: root/docs/featureprojects.rst
diff options
context:
space:
mode:
authorSofia Wallin <sofia.wallin@ericsson.com>2017-03-29 11:30:27 +0200
committerSofia Wallin <sofia.wallin@ericsson.com>2017-03-29 11:30:38 +0200
commita626c7b0b7b745bb7f83862de32086f570a25ed0 (patch)
treeb2bbb681b84d99bcb068bca601e7a8597ef0d5bb /docs/featureprojects.rst
parent4447d7aeca56c725b9762f901e0377a63657e962 (diff)
Revert "Add git submodule for openretriever"
This reverts commit 4447d7aeca56c725b9762f901e0377a63657e962. Change-Id: Idaba575bef646bece2699aa518a8d5e3b2cbfac1 Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>
Diffstat (limited to 'docs/featureprojects.rst')
-rw-r--r--docs/featureprojects.rst6
1 files changed, 0 insertions, 6 deletions
diff --git a/docs/featureprojects.rst b/docs/featureprojects.rst
index 8e26ea62d..a9ec17d50 100644
--- a/docs/featureprojects.rst
+++ b/docs/featureprojects.rst
@@ -440,7 +440,6 @@ Snaps
.. toctree::
:maxdepth: 1
-<<<<<<< HEAD
../submodules/snaps/docs/development/overview/index
../submodules/snaps/docs/development/requirements/index
../submodules/snaps/docs/release/installation/index
@@ -520,8 +519,3 @@ Yardstick
../submodules/yardstick/docs/development/manuals/index
-=======
- ../submodules/sfc/docs/userguide/index
- ../submodules/sfc/docs/releasenotes/index
- ../submodules/sfc/docs/installationprocedure/index
->>>>>>> 88a5b11... Add git submodule for openretriever