Remove merge conflict header

3 years ago · 73d4266050
parent 36c6247fb5
commit 73d4266050
1 changed files with 0 additions and 1 deletions
--- 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