From 23f8dfca97a262ea2f8fca792bcd00a66388bf74 Mon Sep 17 00:00:00 2001 From: vaibhav_16dec Date: Thu, 20 Sep 2018 12:32:47 +0000 Subject: Updated git submodules Project: oom master db582fafe8c9f975a0e43e9835c5f7e273eb699d Resource limit:DCAE config resolving merge conflict by implementing common resource template Issue-ID: OOM-1151 Change-Id: I3e2eac98ec1298d366a9a6b83f2a2d3a9846bd1f Signed-off-by: vaibhav_16dec Signed-off-by: Mandeep Khinda --- docs/submodules/oom.git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/submodules/oom.git b/docs/submodules/oom.git index c7dcda78f..db582fafe 160000 --- a/docs/submodules/oom.git +++ b/docs/submodules/oom.git @@ -1 +1 @@ -Subproject commit c7dcda78fcc810dad55633d977cbabc3b56daf22 +Subproject commit db582fafe8c9f975a0e43e9835c5f7e273eb699d -- cgit 1.2.3-korg