javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): fix additional conflicts

Browse Source
This commit is contained in:
Liam DeBeasi
2021-07-21 09:46:04 -04:00
parent 4377d27790
commit 1e7696a0f1
4 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/angular-server/package.json
View File

@@ -49,11 +49,7 @@
"@angular/core": "8.2.13",
"@angular/platform-browser": "8.2.13",
"@angular/platform-server": "8.2.13",
<<<<<<< HEAD
"@ionic/core": "6.0.0-beta.1",
=======
"@ionic/core": "5.6.12",
>>>>>>> origin/main
"ng-packagr": "5.7.1",
"tslint": "^5.12.1",
"tslint-ionic-rules": "0.0.21",