From 19fe78dea03cc9e79a3a1e1daf8d68671d46d0f5 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 22 Nov 2023 10:36:34 +0100
Subject: [PATCH] fix conflict

---
 debian/changelog | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f805e407..ab4a95bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,6 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
 
 llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
 
-<<<<<<<
   [ John Paul Adrian Glaubitz ]
   * Don't run chrpath for libclang on sparc and sparc64
 
@@ -25,16 +24,6 @@ llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
 
   [ Sylvestre Ledru ]
   * New upstream release
-=======
-  [ John Paul Adrian Glaubitz ]
-  * Don't run chrpath for libclang on sparc and sparc64
-
-  [ Matthias Klose ]
-  * Build-depend on llvm-spirv-17.
-
-  [ Sylvestre Ledru ]
-  * New supstream release
->>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 14 Nov 2023 11:27:22 +0100