fix merge

This commit is contained in:
Sylvestre Ledru 2020-09-02 22:35:48 +02:00
parent 1a8415589f
commit 37d3ce298b
2 changed files with 1 additions and 2 deletions

2
debian/control vendored
View File

@ -1,4 +1,4 @@
Source: llvm-toolchain-11 Source: llvm-toolchain-snapshot
Section: devel Section: devel
Priority: optional Priority: optional
Rules-Requires-Root: no Rules-Requires-Root: no

View File

@ -2,7 +2,6 @@
/usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include/omp*.h /usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include/omp*.h
[!armhf !mips64el !mipsel] /usr/lib/llvm-@LLVM_VERSION@/include/ompt-multiplex.h [!armhf !mips64el !mipsel] /usr/lib/llvm-@LLVM_VERSION@/include/ompt-multiplex.h
>>>>>>> origin/11
/usr/lib/llvm-@LLVM_VERSION@/lib/libgomp.so /usr/lib/llvm-@LLVM_VERSION@/lib/libgomp.so
/usr/lib/llvm-@LLVM_VERSION@/lib/libiomp5.so /usr/lib/llvm-@LLVM_VERSION@/lib/libiomp5.so
/usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so /usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so