From 3bf051e2a6a3bd41b4ffe6ccffdcc05c2ff509bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 11 Dec 2020 14:16:18 +0100 Subject: [PATCH] Fix merge. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .gitmodules | 2 +- src/assets/configs-aws | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4c6cd9d4..855c64da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "src/assets/configs-aws"] path = src/assets/configs-aws - url = git@github.com:LucasBrazi06/ev-aws.git + url = git@github.wdf.sap.corp:E-Mobility/ev-aws.git branch = master diff --git a/src/assets/configs-aws b/src/assets/configs-aws index 11bf4789..1de16084 160000 --- a/src/assets/configs-aws +++ b/src/assets/configs-aws @@ -1 +1 @@ -Subproject commit 11bf4789c3f4cc33ea06f5204be41d0a5f12e429 +Subproject commit 1de160843a35b6e684531306256615d31c85590b -- 2.34.1