From 20234b3894e5de036802d4ecd530cebe529ca1c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Thu, 12 Nov 2020 13:09:38 +0100
Subject: [PATCH] fixup debian/changelog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 debian/changelog | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e450c06a..92172784 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -748,12 +748,6 @@ llvm-toolchain-snapshot (1:10~svn366440-1~exp1) experimental; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 18 Jul 2019 18:58:32 +0200
 
-<<<<<<< HEAD
-llvm-toolchain-9 (1:9.0.1-13~bpo10+pve1) proxmox-rust; urgency=medium
-
-  [ Aurelien Jarno ]
-  * Add mips-force-nomadd4.diff to default to +nomadd4 on MIPS.
-=======
 llvm-toolchain-9 (1:9.0.1-15) unstable; urgency=low
 
   * Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP.
@@ -775,26 +769,27 @@ llvm-toolchain-9 (1:9.0.1-14) unstable; urgency=medium
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 15 Aug 2020 21:53:41 +0200
 
+llvm-toolchain-9 (1:9.0.1-13~bpo10+pve1) proxmox-rust; urgency=medium
+
+  [ Aurelien Jarno ]
+  * Add mips-force-nomadd4.diff to default to +nomadd4 on MIPS.
+  [ Proxmox Support Team ]
+  * Rebuild for Debian Buster / Proxmox
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jul 2020 08:58:19 +0200
+
 llvm-toolchain-9 (1:9.0.1-13) unstable; urgency=medium
 
   [ Aurelien Jarno ]
   * Add mips-force-nomadd4.diff to default to +nomadd4 on MIPS. (Closes:
     #964988)
->>>>>>> debian/11.0.0-5
 
   [ Ximin Luo ]
   * Add 373184.patch to fix soundness issue affecting rustc. (Closes: #959877)
   * Add f8e146f3430de3a6cd904f3f3f7aa1bfaefee14c.patch to fix big-endian
     miscompilation affecting rustc.
 
-<<<<<<< HEAD
-  [ Proxmox Support Team ]
-  * Rebuild for Debian Buster / Proxmox
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jul 2020 08:58:19 +0200
-=======
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 07 Jul 2020 18:18:00 +0200
->>>>>>> debian/11.0.0-5
 
 llvm-toolchain-9 (1:9.0.1-12) unstable; urgency=medium