Fix merge conflict 29/109829/1
authorSarah Abouzainah <sabouzainah.ext@orange.com>
Sun, 5 Jul 2020 17:45:40 +0000 (19:45 +0200)
committerSarah Abouzainah <sabouzainah.ext@orange.com>
Sun, 5 Jul 2020 17:45:40 +0000 (19:45 +0200)
commit95c9520d46c925fdf7095552fa4f91167d555069
tree538b33600bd24358064516499d8137abcc4b8db8
parent01e3ff777b995767311be29ad51ebba53cb054c2
Fix merge conflict

Issue-ID: CCSDK-2477

Signed-off-by: Sarah Abouzainah <sabouzainah.ext@orange.com>
Change-Id: I86cdfdf56ae7e7dce00b17184117c94263cda250
cds-ui/designer-client/package.json
cds-ui/designer-client/src/assets/img/icon-info-color.svg [new file with mode: 0644]
cds-ui/designer-client/src/styles.css