merge conflicts

This commit is contained in:
SvetlanaMuravlova
2022-09-16 13:26:36 +03:00
4 changed files with 71 additions and 102 deletions

View File

@@ -1,12 +1,12 @@
{
"name": "ng2-file-upload",
"version": "2.0.0-3",
"version": "3.0.0",
"description": "Angular file uploader",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT",
"peerDependencies": {
"@angular/core": "^11.0.0 || ^12.0.0",
"@angular/common": "^11.0.0 || ^12.0.0"
"@angular/core": "^13.0.0",
"@angular/common": "^13.0.0"
},
"sideEffects": false,
"publishConfig": {