From a63b4afb936fff190c7b341a7f993c8dcadc95be Mon Sep 17 00:00:00 2001
From: Jay <lygm1062@gmail.com>
Date: Mon, 4 Nov 2024 14:59:50 +0800
Subject: [PATCH] Fix workflows (#60)

---
 .github/workflows/xtoken-ui-dev.yml | 5 -----
 .github/workflows/xtoken-ui-prd.yml | 4 ----
 package.json                        | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/xtoken-ui-dev.yml b/.github/workflows/xtoken-ui-dev.yml
index 3bdd6bf..4255a52 100644
--- a/.github/workflows/xtoken-ui-dev.yml
+++ b/.github/workflows/xtoken-ui-dev.yml
@@ -47,9 +47,4 @@ jobs:
           alias_domain: "xtokenui-dev-testnet"
           enable_cache: true
           enable_notify_comment: true
-<<<<<<< HEAD
-=======
-          enable_notify_slack: false
-          slack_channel: helixbox-ui
->>>>>>> main
           slack_webhook: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
diff --git a/.github/workflows/xtoken-ui-prd.yml b/.github/workflows/xtoken-ui-prd.yml
index f3da1ff..79ad697 100644
--- a/.github/workflows/xtoken-ui-prd.yml
+++ b/.github/workflows/xtoken-ui-prd.yml
@@ -53,9 +53,5 @@ jobs:
           prod_mode: true
           enable_cache: true
           enable_notify_slack: true
-<<<<<<< HEAD
-          slack_channel: helixbox-xtoken
-=======
           slack_channel: helixbox-ui
->>>>>>> main
           slack_webhook: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
diff --git a/package.json b/package.json
index 41fb3b5..53620fe 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "workspaces": [
     "packages/*"
   ],
-  "author": "Helix Bridge",
+  "author": "Helixbox",
   "license": "ISC",
   "bugs": {
     "url": "https://github.com/helix-bridge/xtoken-monorepo/issues"