From d8241ba6a0b6aadab75c75c640804e0f2442726f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 23 Sep 2020 09:09:24 +0200
Subject: [PATCH] fix conflict

---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 488d9fd7..1c84df64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,7 +42,6 @@ llvm-toolchain-snapshot (1:12~++20200715052739+d6e79e3dd6d-1~exp1) experimental;
 
 llvm-toolchain-11 (1:11.0.0~+rc3-1) unstable; urgency=medium
 
-  * New snapshot release
   * New rc release
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 22 Sep 2020 17:19:40 +0200