summaryrefslogtreecommitdiffstats
path: root/cds-ui/designer-client/package.json
diff options
context:
space:
mode:
authorSarah Abouzainah <sabouzainah.ext@orange.com>2020-07-05 19:45:40 +0200
committerSarah Abouzainah <sabouzainah.ext@orange.com>2020-07-05 19:45:40 +0200
commit95c9520d46c925fdf7095552fa4f91167d555069 (patch)
tree538b33600bd24358064516499d8137abcc4b8db8 /cds-ui/designer-client/package.json
parent01e3ff777b995767311be29ad51ebba53cb054c2 (diff)
Fix merge conflict
Issue-ID: CCSDK-2477 Signed-off-by: Sarah Abouzainah <sabouzainah.ext@orange.com> Change-Id: I86cdfdf56ae7e7dce00b17184117c94263cda250
Diffstat (limited to 'cds-ui/designer-client/package.json')
-rw-r--r--cds-ui/designer-client/package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/cds-ui/designer-client/package.json b/cds-ui/designer-client/package.json
index 59cc5b550..5b08d6fce 100644
--- a/cds-ui/designer-client/package.json
+++ b/cds-ui/designer-client/package.json
@@ -77,4 +77,4 @@
"tslint": "~5.15.0",
"typescript": "~3.5.3"
}
-} \ No newline at end of file
+}