From 11eb8aa2e57718bcc9666a42bf4640634ff042c7 Mon Sep 17 00:00:00 2001
From: Gabriel Kheisa <63294471+gabrielkheisa@users.noreply.github.com>
Date: Sun, 7 Apr 2024 16:04:26 +0700
Subject: [PATCH] Update main.yml

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2ca470c..1bdd543 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,8 +17,4 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Build Docker image
-<<<<<<< HEAD
       run: docker build -t discord-badge .
-=======
-      run: docker build -t discord-badge .
->>>>>>> dev