proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 15:03:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Sylvestre Ledru 2023-09-07 13:49:26 +02:00
parent d1a622b9b6
commit 3fdc3c3920
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/control vendored
View File

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