[llvm] b8ec05a - llvmbuildectomy - remove conflict file

[via llvm-commits]

Author: serge-sans-paille
Date: 2020-11-13T15:56:05+01:00
New Revision: b8ec05a53355f10062a616841bc87352811c23e9

URL: https://github.com/llvm/llvm-project/commit/b8ec05a53355f10062a616841bc87352811c23e9
DIFF: https://github.com/llvm/llvm-project/commit/b8ec05a53355f10062a616841bc87352811c23e9.diff

LOG: llvmbuildectomy - remove conflict file

Added: 
    

Modified: 
    

Removed: 
    llvm/lib/ExecutionEngine/Orc/Shared/LLVMBuild.txt.rej


################################################################################
diff  --git a/llvm/lib/ExecutionEngine/Orc/Shared/LLVMBuild.txt.rej b/llvm/lib/ExecutionEngine/Orc/Shared/LLVMBuild.txt.rej
deleted file mode 100644
index 49d4038c2bf5..000000000000
--- a/llvm/lib/ExecutionEngine/Orc/Shared/LLVMBuild.txt.rej
+++ /dev/null
@@ -1,27 +0,0 @@
-***************
-*** 1,4 ****
-- ;===- ./lib/ExecutionEngine/OrcError/LLVMBuild.txt -------------*- Conf -*--===;
-  ;
-  ; Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-  ; See https://llvm.org/LICENSE.txt for license information.
---- 1,4 ----
-+ ;===- ./tools/llvm-jitlink/llvm-jitlink-executor/LLVMBuild.txt -*- Conf -*--===;
-  ;
-  ; Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-  ; See https://llvm.org/LICENSE.txt for license information.
-***************
-*** 15,21 ****
-  ;===------------------------------------------------------------------------===;
-  
-  [component_0]
-- type = Library
-- name = OrcError
-- parent = ExecutionEngine
-- required_libraries = Support
---- 15,20 ----
-  ;===------------------------------------------------------------------------===;
-  
-  [component_0]
-+ type = Tool
-+ name = llvm-jitlink-executor
-+ parent = llvm-jitlink