From 1e7696a0f16b3c7a1bdd511493beccdaa2d71e5b Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 21 Jul 2021 09:46:04 -0400 Subject: [PATCH] chore(): fix additional conflicts --- angular/package-lock.json | 12 ------------ packages/angular-server/package-lock.json | 6 ------ packages/angular-server/package.json | 4 ---- packages/vue/package-lock.json | 6 ------ 4 files changed, 28 deletions(-) diff --git a/angular/package-lock.json b/angular/package-lock.json index a1ab72f06e..89e42bf1bc 100644 --- a/angular/package-lock.json +++ b/angular/package-lock.json @@ -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", diff --git a/packages/angular-server/package-lock.json b/packages/angular-server/package-lock.json index f011dd06da..10bf83d73d 100644 --- a/packages/angular-server/package-lock.json +++ b/packages/angular-server/package-lock.json @@ -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", diff --git a/packages/angular-server/package.json b/packages/angular-server/package.json index 4d3d5d5ef5..f05c0cdd33 100644 --- a/packages/angular-server/package.json +++ b/packages/angular-server/package.json @@ -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", diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json index 2e0218bae2..274c5addcc 100644 --- a/packages/vue/package-lock.json +++ b/packages/vue/package-lock.json @@ -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",