Merge branch 'main' into asia

ChatCRM · Jun 9, 2024 · a654c1b · a654c1b
2 parents fe46798 + 0f522e4
commit a654c1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/liara.yaml b/.github/workflows/liara.yaml
@@ -3,7 +3,7 @@ name: Asia-Insurance-CD-Liara
 on:
   push:
     branches:
-      - main
+      - asia
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: '20'
 
       - name: Install Liara CLI
         run: npm i -g @liara/cli@6

diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,7 @@ yarn-error.log*
 .env
 .vercel
 .vscode
+<<<<<<< HEAD
+=======
+.env*
+>>>>>>> main
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,3 +37,7 @@ yarn-error.log* @@
     .env
     .vercel
     .vscode
+    <<<<<<< HEAD
+    =======
+    .env*
+    >>>>>>> main