From 4447d7aeca56c725b9762f901e0377a63657e962 Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Mon, 13 Mar 2017 19:22:47 -0400 Subject: Add git submodule for openretriever TODO: there is recursive dependency between opnvdocs and docs in openretrive. submodules in openretriever will be updated in docs/featureprojects.rst after https://gerrit.opnfv.org/gerrit/#/c/28583/ was merged. Change-Id: I21dd160d42cbf9d5938a70b10b66390ff031ffe8 Signed-off-by: Guo Ruijing Signed-off-by: Sofia Wallin --- docs/featureprojects.rst | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/featureprojects.rst') diff --git a/docs/featureprojects.rst b/docs/featureprojects.rst index a9ec17d50..8e26ea62d 100644 --- a/docs/featureprojects.rst +++ b/docs/featureprojects.rst @@ -440,6 +440,7 @@ Snaps .. toctree:: :maxdepth: 1 +<<<<<<< HEAD ../submodules/snaps/docs/development/overview/index ../submodules/snaps/docs/development/requirements/index ../submodules/snaps/docs/release/installation/index @@ -519,3 +520,8 @@ 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 -- cgit 1.2.3-korg