diff options
Diffstat (limited to 'docs/featureprojects.rst')
| -rw-r--r-- | docs/featureprojects.rst | 6 |
1 files changed, 6 insertions, 0 deletions
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 |