From 0db7a23c0754ef5ad800a3de65674537fc09e4a6 Mon Sep 17 00:00:00 2001
From: mrsang <mrsang@iohub.dev>
Date: Wed, 31 Mar 2021 23:23:24 +0200
Subject: [PATCH] fix merge conflict

---
 ShowCase/build/debug/package.json   |   4 ----
 ShowCase/build/release/ShowCase.zip | Bin 9757 -> 9663 bytes
 ShowCase/package.json               |   4 ----
 packages.json                       |   3 +--
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/ShowCase/build/debug/package.json b/ShowCase/build/debug/package.json
index 53ffebb..2014f94 100644
--- a/ShowCase/build/debug/package.json
+++ b/ShowCase/build/debug/package.json
@@ -8,11 +8,7 @@
         "licences": "GPLv3"
     },
     "version":"0.0.7-a",
-<<<<<<< HEAD
     "category":"Utility",
-=======
-    "category":"Other",
->>>>>>> c3df98de9effd1c129b9e5b36420bda12ea4cdba
     "mimes":["none"],
     "iconclass": "fa fa-delicious",
     "locales": {
diff --git a/ShowCase/build/release/ShowCase.zip b/ShowCase/build/release/ShowCase.zip
index f6685e47174dd8af90f4e3ba44395501fbb77bc6..a6634e0918a8203ea691442461b1a3386e4a7aa6 100644
GIT binary patch
delta 195
zcmbR1v)`L1z?+$civa|#uA0cB$^;~h>v^xPst=mfWqr7ek%6IX<9<#?Nd+KKN=__E
zP0uf?RI*YEEy>KuEU8q|nQYHg2-LNC6H~qfh*p-q%?YF@shR-E$!4misD@3hP}MaD
z8NX)U!A>6u1_lsj2Ri^pcrY<A<R)h3>17oMcr!AIFu>e5`Hrd#(@v?$zf@(}rl^3F
F0{}>jI&=U4

delta 275
zcmdn*J=cdPz?+$civa|3S5D+nWdf4M^}M+&>w{QJoc~>6WMH_maX%+xy$u8?c(^*c
za47(RQgUKRYI=TArIM9WXh~*HW=W-z4wo$iV5smf$w(~%%G*JJLb7p6nx#cbs%2_g
zT8d$^p^;^hWvXeCv6+dHK~hShp;2n0Npeb3BE+EF%*ihqGnw*MZVq9}mjKa6rEYTq
z-8y-ZiV29ip<;^a=E+j3x<GZ4Jym5SmoWi7mzbHSmsK3#&B!Fe0P!zSwoX-sNnCpJ
N993DiPb#1=007$*P<Q|U

diff --git a/ShowCase/package.json b/ShowCase/package.json
index 53ffebb..2014f94 100644
--- a/ShowCase/package.json
+++ b/ShowCase/package.json
@@ -8,11 +8,7 @@
         "licences": "GPLv3"
     },
     "version":"0.0.7-a",
-<<<<<<< HEAD
     "category":"Utility",
-=======
-    "category":"Other",
->>>>>>> c3df98de9effd1c129b9e5b36420bda12ea4cdba
     "mimes":["none"],
     "iconclass": "fa fa-delicious",
     "locales": {
diff --git a/packages.json b/packages.json
index 06d7433..5ea362a 100644
--- a/packages.json
+++ b/packages.json
@@ -253,8 +253,7 @@
 		"pkgname": "ShowCase",
 		"name": "ShowCase",
 		"description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/ShowCase/README.md",
-		"category": "Utility
-Other",
+		"category": "Utility",
 		"author": "Xuan Sang LE",
 		"version": "0.0.7-a",
 		"dependencies": [],