From 4f8adfe9829d9e465886f45d96cef767486824af Mon Sep 17 00:00:00 2001
From: nnivxix <adhe.hanasa@gmail.com>
Date: Thu, 3 Oct 2024 21:35:03 +0700
Subject: [PATCH] fix

---
 .github/workflows/node.js.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 154d7da..2e99cdc 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -25,8 +25,4 @@ jobs:
       - name: Install dependencies
         run: pnpm install
       - name: Run Test
-<<<<<<< HEAD
         run: pnpm test
-=======
-        run: pnpm test
->>>>>>> 68115cbd4e641702d544029a12dec066d2ad91be