resolved conflicts

gcsns · Dec 8, 2023 · 25af273 · 25af273
2 parents ff67974 + 6677623
commit 25af273
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,6 +8,7 @@ on:
       - master
       - feat-aisensy
       - feat/shop-3471
+      - feat/broadcast-list
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub

diff --git a/...rd/routes/dashboard/settings/campaigns/whatsapp-compaign/components/CampaignAnalytics.vue b/...rd/routes/dashboard/settings/campaigns/whatsapp-compaign/components/CampaignAnalytics.vue
@@ -22,7 +22,7 @@ export default {
     const id = split[split.length - 1];
     const token =
       'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3MzI4MjQwMDAwMDB9.q2UqaJswlXkpqi4xk1Grp7vXj1g9DE9OvyjH4HV2DbU';
-    const path = `http://localhost:3001/campaignDetails/${id}?hideSideBar=true&token=${token}`;
+    const path = `https://merchant-stg.goshopkey.com/campaignDetails/${id}?hideSideBar=true&token=${token}`;
     this.url = path;
   },
   methods: {},

diff --git a/config/schedule.yml b/config/schedule.yml
@@ -10,7 +10,7 @@ internal_check_new_versions_job:
 
 # executed At every 5th minute..
 trigger_scheduled_items_job:
-  cron: '*/5 * * * *'
+  cron: '*/1 * * * *'
   class: 'TriggerScheduledItemsJob'
   queue: scheduled_jobs