From ddcae60d8aaa94d67408d7b585bdb716536df75e Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Tue, 26 Jul 2016 17:53:00 +0100 Subject: [PATCH] fix rebase --- demo-shell-ng2/package.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index b897f975c2..9c1d2e0581 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -73,12 +73,7 @@ "ng2-translate": "2.2.0", "pdfjs-dist": "1.5.258", "flag-icon-css": "2.3.0", -<<<<<<< HEAD - "alfresco-js-api": "0.2.1", -======= - "alfresco-js-api": "0.1.0", ->>>>>>> fast deploy on aws "ng2-alfresco-core": "0.2.0", "ng2-alfresco-datatable": "0.2.0", "ng2-alfresco-documentlist": "0.2.0",