diff options
| author |   Sofia Wallin <sofia.wallin@ericsson.com> | 2017-03-29 09:31:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-29 09:31:30 +0000 |
| commit | 1f1ef2b1e9ac6a737bccff6679866038f3be636a (patch) | |
| tree | bf20a0d029b3d0740c1e31b279b490018f2742d2 | |
| parent | 36dbfb57fb2ac56f487f36813ebb32c8a19d765b (diff) | |
| parent | a626c7b0b7b745bb7f83862de32086f570a25ed0 (diff) | |
Merge "Revert "Add git submodule for openretriever""
| -rw-r--r-- | .gitmodules | 5 | ||||
| -rw-r--r-- | docs/featureprojects.rst | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/.gitmodules b/.gitmodules index c428ebf12..fa60a7123 100644 --- a/.gitmodules +++ b/.gitmodules @@ -187,8 +187,3 @@ url = ../barometer branch = . ignore = dirty -[submodule "docs/submodules/openretriever"] - path = docs/submodules/openretriever - url = https://gerrit.opnfv.org/gerrit/openretriever - branch = . - ignore = dirty 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 |