From 75949f8ea3c7477de32464918c44152e59e4cdb5 Mon Sep 17 00:00:00 2001
From: Un conejo <bnuuy64@meow.boutique>
Date: Sun, 25 May 2025 13:59:46 -0400
Subject: [PATCH] a

---
 .forgejo/workflows/build.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index b7a34f3..d470cda 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -1,10 +1,6 @@
 on: [push]
 jobs:
   test:
-<<<<<<< HEAD
     runs-on: docker
-=======
-    runs-on: minecrap
->>>>>>> refs/remotes/origin/master
     steps:
       - run: echo All Good