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

12
angular/package-lock.json generated
View File

@@ -204,15 +204,9 @@
}
},
"node_modules/@ionic/core": {
<<<<<<< HEAD
"version": "6.0.0-beta.0",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.0.0-beta.0.tgz",
"integrity": "sha512-KQc0qDNcF7ustP0hTKmxqZmgfEB0r+UheEAc47K8wDZSJrjyp0Fnt7b3fT+7GAU23kEFfu5KY7leYXXQYxOl3g==",
=======
"version": "5.6.11",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.11.tgz",
"integrity": "sha512-bWn2K3L/QWRUs8SBm+YJcgJhOO6W00eipfxJunlAr/7PbMePdqYnU+PQ2Cv54ufK3yUtLr2b0YdvZ9wZ6pGS3w==",
>>>>>>> origin/main
"dependencies": {
"@stencil/core": "^2.6.0",
"ionicons": "^5.5.1",
@@ -5162,15 +5156,9 @@
}
},
"@ionic/core": {
<<<<<<< HEAD
"version": "6.0.0-beta.0",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.0.0-beta.0.tgz",
"integrity": "sha512-KQc0qDNcF7ustP0hTKmxqZmgfEB0r+UheEAc47K8wDZSJrjyp0Fnt7b3fT+7GAU23kEFfu5KY7leYXXQYxOl3g==",
=======
"version": "5.6.11",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.11.tgz",
"integrity": "sha512-bWn2K3L/QWRUs8SBm+YJcgJhOO6W00eipfxJunlAr/7PbMePdqYnU+PQ2Cv54ufK3yUtLr2b0YdvZ9wZ6pGS3w==",
>>>>>>> origin/main
"requires": {
"@stencil/core": "^2.6.0",
"ionicons": "^5.5.1",

6
packages/angular-server/package-lock.json generated
View File

@@ -5424,15 +5424,9 @@
}
},
"@ionic/core": {
<<<<<<< HEAD
"version": "6.0.0-beta.0",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.0.0-beta.0.tgz",
"integrity": "sha512-KQc0qDNcF7ustP0hTKmxqZmgfEB0r+UheEAc47K8wDZSJrjyp0Fnt7b3fT+7GAU23kEFfu5KY7leYXXQYxOl3g==",
=======
"version": "5.6.11",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.11.tgz",
"integrity": "sha512-bWn2K3L/QWRUs8SBm+YJcgJhOO6W00eipfxJunlAr/7PbMePdqYnU+PQ2Cv54ufK3yUtLr2b0YdvZ9wZ6pGS3w==",
>>>>>>> origin/main
"dev": true,
"requires": {
"@stencil/core": "^2.6.0",

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",

6
packages/vue/package-lock.json generated
View File

@@ -633,15 +633,9 @@
}
},
"@ionic/core": {
<<<<<<< HEAD
"version": "6.0.0-beta.0",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.0.0-beta.0.tgz",
"integrity": "sha512-KQc0qDNcF7ustP0hTKmxqZmgfEB0r+UheEAc47K8wDZSJrjyp0Fnt7b3fT+7GAU23kEFfu5KY7leYXXQYxOl3g==",
=======
"version": "5.6.11",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.11.tgz",
"integrity": "sha512-bWn2K3L/QWRUs8SBm+YJcgJhOO6W00eipfxJunlAr/7PbMePdqYnU+PQ2Cv54ufK3yUtLr2b0YdvZ9wZ6pGS3w==",
>>>>>>> origin/main
"requires": {
"@stencil/core": "^2.6.0",
"ionicons": "^5.5.1",