From 92c648eb84c6755e0e9fb4d705eb33748f003b65 Mon Sep 17 00:00:00 2001
From: pat-s <patrick.schratz@gmail.com>
Date: Sat, 27 Apr 2024 22:58:45 +0200
Subject: [PATCH] merge main

---
 .woodpecker/build.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 5b8f253..00097b2 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -4,12 +4,9 @@ when:
     branch:
       - ${CI_REPO_DEFAULT_BRANCH}
       - renovate/*
-<<<<<<< HEAD:.woodpecker/build.yml
 
 depends_on:
   - lint
-=======
->>>>>>> main:.woodpecker.yml
 
 steps:
   # use vendor to cache dependencies