From 3fdc3c39207b174d7ec7166963ee23843329d26b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 7 Sep 2023 13:49:26 +0200
Subject: [PATCH] fix conflict

---
 debian/control | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 56de656e..ca2eea7b 100644
--- a/debian/control
+++ b/debian/control
@@ -687,13 +687,8 @@ Package: libc++-17-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-<<<<<<< HEAD
 Depends: libc++1-17 (= ${binary:Version}), ${misc:Depends},
- libunwind-17-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64]
-=======
-Depends: libc++1-16 (= ${binary:Version}), ${misc:Depends},
- libunwind-16-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64]
->>>>>>> origin/16
+ libunwind-17-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev