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

fix merge conflicts

Browse Source
This commit is contained in:
Liam DeBeasi
2021-07-01 12:08:32 -04:00
parent b735b587cd 34aad178d0
commit 1bb01c7634
9 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/package.json
View File

@@ -1,6 +1,10 @@
{
"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",