peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

solve conflit

Browse Source
This commit is contained in:
tiago.kayaya
2021-02-26 16:34:04 +01:00
parent 25ffc18a45
commit 80ffcbd5be
5 changed files with 36 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
-18
View File
@@ -64,31 +64,18 @@
"zone.js": "~0.10.2"
},
"devDependencies": {
<<<<<<< HEAD
"@angular-devkit/build-angular": "~0.901.5",
"@angular/cli": "9.1.12",
"@angular/compiler": "~9.1.6",
"@angular/compiler-cli": "~9.1.6",
"@angular/language-service": "~9.1.6",
"@ionic/angular-toolkit": "^3.1.0",
=======
"@angular-devkit/build-angular": "^0.1102.1",
"@angular/cli": "11.2.1",
"@angular/compiler": "~11.2.2",
"@angular/compiler-cli": "^11.2.2",
"@angular/language-service": "~11.2.2",
"@ionic/angular-toolkit": "^3.0.0",
>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
"@ionic/lab": "3.1.7",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
<<<<<<< HEAD
"codelyzer": "^5.1.2",
=======
"codelyzer": "^6.0.0",
"cordova-android": "^9.0.0",
>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
"cordova-browser": "^6.0.0",
"cordova-plugin-compat": "^1.2.0",
"cordova-plugin-device": "^2.0.2",
@@ -127,13 +114,8 @@
"cordova-plugin-mfp": {}
},
"platforms": [
<<<<<<< HEAD
"ios",
"browser"
=======
"browser",
"android"
>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
]
},
"main": "karma.conf.js",