inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix rebase

Browse Source
This commit is contained in:
Mario Romano
2016-07-26 17:53:00 +01:00
parent c544cdce7d
commit ddcae60d8a
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
demo-shell-ng2/package.json
View File

@@ -73,12 +73,7 @@
"ng2-translate": "2.2.0", "ng2-translate": "2.2.0",
"pdfjs-dist": "1.5.258", "pdfjs-dist": "1.5.258",
"flag-icon-css": "2.3.0", "flag-icon-css": "2.3.0",
<<<<<<< HEAD
"alfresco-js-api": "0.2.1", "alfresco-js-api": "0.2.1",
=======
"alfresco-js-api": "0.1.0",
>>>>>>> fast deploy on aws
"ng2-alfresco-core": "0.2.0", "ng2-alfresco-core": "0.2.0",
"ng2-alfresco-datatable": "0.2.0", "ng2-alfresco-datatable": "0.2.0",
"ng2-alfresco-documentlist": "0.2.0", "ng2-alfresco-documentlist": "0.2.0",