From 73d4266050e5543e8133e2f273feaf7a9157d9eb Mon Sep 17 00:00:00 2001
From: Justin Zobel <justin@1707.io>
Date: Thu, 16 Jun 2022 14:36:44 +0930
Subject: [PATCH] Remove merge conflict header

---
 kf5-kwayland.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kf5-kwayland.spec b/kf5-kwayland.spec
index 28dc182..4ff6bc3 100644
--- a/kf5-kwayland.spec
+++ b/kf5-kwayland.spec
@@ -112,7 +112,6 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||:
 
 
 %changelog
-<<<<<<< HEAD
 * Mon Apr 11 2022 Justin Zobel <justin@1707.io> - 5.93.0-1
 - Update to 5.93.0