From a626c7b0b7b745bb7f83862de32086f570a25ed0 Mon Sep 17 00:00:00 2001 From: Sofia Wallin Date: Wed, 29 Mar 2017 11:30:27 +0200 Subject: [PATCH] Revert "Add git submodule for openretriever" This reverts commit 4447d7aeca56c725b9762f901e0377a63657e962. Change-Id: Idaba575bef646bece2699aa518a8d5e3b2cbfac1 Signed-off-by: Sofia Wallin --- .gitmodules | 5 ----- docs/featureprojects.rst | 6 ------ 2 files changed, 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 -- 2.16.6