diff options
author | 2020-07-06 13:20:34 +0000 | |
---|---|---|
committer | 2020-07-06 13:20:34 +0000 | |
commit | 188c717c2201b8ae5848f31593d3361508da98da (patch) | |
tree | 3b8cd6197cbf5b9fb018082d77b27ef681ef72fd /cds-ui/designer-client/package.json | |
parent | fc710fa771e265841957b4b125b5f85090ae64e6 (diff) | |
parent | 95c9520d46c925fdf7095552fa4f91167d555069 (diff) |
Merge "Fix merge conflict"
Diffstat (limited to 'cds-ui/designer-client/package.json')
-rw-r--r-- | cds-ui/designer-client/package.json | 2 |
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 +} |