From 4a85abfb98a09e65eb69a5bcdeb73033905b532f 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 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4f8ebae..0e7ab8dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,6 @@
 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