dany/antosdk-apps
1
0
Fork 0
mirror of https://github.com/antos-rde/antosdk-apps.git synced 2025-07-13 06:04:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
mrsang
2021-03-31 23:12:04 +02:00
parent ada4358d61 c3df98de9e
commit 38bde537e7
5 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ShowCase/build/debug/main.js
View File

File diff suppressed because one or more lines are too long

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

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