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

---
 debian/orig-tar.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 309adc8a..bdc0cd57 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -35,7 +35,6 @@ fi
 GIT_BASE_URL=https://github.com/llvm/llvm-project
 GIT_TOOLCHAIN_CHECK=https://github.com/opencollab/llvm-toolchain-integration-test-suite.git
 
-
 reset_repo ()
 {
     cd $1