Merge "Revert "Add git submodule for openretriever""

diff --git a/.gitmodules b/.gitmodules
index c428ebf..fa60a71 100644 (file)
--- 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 8e26ea6..a9ec17d 100644 (file)
--- 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