From 95c9520d46c925fdf7095552fa4f91167d555069 Mon Sep 17 00:00:00 2001
From: Sarah Abouzainah <sabouzainah.ext@orange.com>
Date: Sun, 5 Jul 2020 19:45:40 +0200
Subject: 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cds-ui/designer-client/package.json')

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
+}
-- 
cgit 1.2.3-korg