dany/antosdk-apps
1
0
Fork 0
mirror of https://github.com/antos-rde/antosdk-apps.git synced 2024-11-20 04:08:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
mrsang 2021-03-31 23:23:24 +02:00
parent 84e104a692
commit 0db7a23c07
4 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ShowCase/build/debug/package.json
View File

@ -8,11 +8,7 @@
"licences": "GPLv3" "licences": "GPLv3"
}, },
"version":"0.0.7-a", "version":"0.0.7-a",
<<<<<<< HEAD
"category":"Utility", "category":"Utility",
=======
"category":"Other",
>>>>>>> c3df98de9effd1c129b9e5b36420bda12ea4cdba
"mimes":["none"], "mimes":["none"],
"iconclass": "fa fa-delicious", "iconclass": "fa fa-delicious",
"locales": { "locales": {

BIN
ShowCase/build/release/ShowCase.zip
View File

Binary file not shown.

4
ShowCase/package.json
View File

@ -8,11 +8,7 @@
"licences": "GPLv3" "licences": "GPLv3"
}, },
"version":"0.0.7-a", "version":"0.0.7-a",
<<<<<<< HEAD
"category":"Utility", "category":"Utility",
=======
"category":"Other",
>>>>>>> c3df98de9effd1c129b9e5b36420bda12ea4cdba
"mimes":["none"], "mimes":["none"],
"iconclass": "fa fa-delicious", "iconclass": "fa fa-delicious",
"locales": { "locales": {

3
packages.json
View File

@ -253,8 +253,7 @@
"pkgname": "ShowCase", "pkgname": "ShowCase",
"name": "ShowCase", "name": "ShowCase",
"description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/ShowCase/README.md", "description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/ShowCase/README.md",
"category": "Utility "category": "Utility",
Other",
"author": "Xuan Sang LE", "author": "Xuan Sang LE",
"version": "0.0.7-a", "version": "0.0.7-a",
"dependencies": [], "dependencies": [],