Fix merge.
authorJérôme Benoit <jerome.benoit@sap.com>
Fri, 11 Dec 2020 13:16:18 +0000 (14:16 +0100)
committerJérôme Benoit <jerome.benoit@sap.com>
Fri, 11 Dec 2020 13:16:18 +0000 (14:16 +0100)
commit3bf051e2a6a3bd41b4ffe6ccffdcc05c2ff509bc
tree85f10f7045133f7b3a618feaf0105af5c23fd3b6
parentc21be2a97cac9b2e06ca225ba9fe1282dad8ef6d
Fix merge.

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
.gitmodules
src/assets/configs-aws