Skip to content

Commit 8eef21a

Browse files
committed
Fix incorrectly resolved mrevious merge conflict
1 parent 417c0fa commit 8eef21a

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

clang/tools/clang-sycl-linker/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
set(LLVM_LINK_COMPONENTS
22
${LLVM_TARGETS_TO_BUILD}
3-
<<<<<<< HEAD
4-
Support
5-
BinaryFormat
6-
TargetParser
7-
=======
83
BinaryFormat
9-
>>>>>>> 0d499f9043fed14ff8c7f9e24e19206c93aee5dd
104
Option
115
Object
126
TargetParser

0 commit comments

Comments
 (0)