From 2910130b0a2da2b05be6fc3109bbd6f5f7c45e95 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 8 Jul 2020 14:39:30 +0200
Subject: [PATCH] Fix conflict

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5b30f912..37aa4036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-snapshot (1:11~++20200702111259+07bda98b6af-1~exp1) UNRELEASED; urgency=medium
+
+  * experimental New snapshot release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 02 Jul 2020 11:16:03 +0200
+
 llvm-toolchain-snapshot (1:11~++20200701093119+ffee8040534-1~exp2) UNRELEASED; urgency=medium
 
   * debian/patches/hurd/hurd-EIEIO-undef.diff: Remove, upstreamed.