From 2e30ad8bce1ce20f31639ed7fe06d75766b33d57 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Thu, 1 Jul 2021 13:09:04 -0400 Subject: [PATCH] chore(): fix merge conflict --- docs/package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/package.json b/docs/package.json index 0119839986..27a26be09a 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,10 +1,6 @@ { "name": "@ionic/docs", -<<<<<<< HEAD "version": "6.0.0-beta.0", -======= - "version": "5.6.11", ->>>>>>> origin/master "description": "Pre-packaged API documentation for the Ionic docs.", "main": "core.json", "types": "core.d.ts",