From 1fee12919900d6f76b86868175fa983ebd53ed55 Mon Sep 17 00:00:00 2001
From: Saskia Hiltemann <zazkia@gmail.com>
Date: Thu, 17 Oct 2024 10:43:59 +0200
Subject: [PATCH] remove stray conflict line

---
 CONTRIBUTORS.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CONTRIBUTORS.yaml b/CONTRIBUTORS.yaml
index 315ab832fa2dd..75f94bee0b8bc 100644
--- a/CONTRIBUTORS.yaml
+++ b/CONTRIBUTORS.yaml
@@ -2582,7 +2582,6 @@ ThibaudGlinez:
       - pndb
       - elixir-europe
 
-<<<<<<< HEAD
 sonjafiliposka:
     name: Sonja Filiposka
     joined: 2024-07