From eb50971f63b660733b05564c6263d954029c3dbf Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 25 Apr 2017 19:11:13 +0000
Subject: [PATCH] fix changelog

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

diff --git a/debian/changelog b/debian/changelog
index d069ec14..cc7255a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,6 @@ llvm-toolchain-4.0 (1:4.0-5) unstable; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 25 Apr 2017 13:32:25 +0200
 
->>>>>>> .r2572
 llvm-toolchain-4.0 (1:4.0-4) unstable; urgency=medium
 
   * Limit the archs where the ocaml binding is built