[all-commits] [llvm/llvm-project] b8ec05: llvmbuildectomy - remove conflict file

[serge-sans-paille via All-commits]

  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: b8ec05a53355f10062a616841bc87352811c23e9
      https://github.com/llvm/llvm-project/commit/b8ec05a53355f10062a616841bc87352811c23e9
  Author: serge-sans-paille <sguelton at redhat.com>
  Date:   2020-11-13 (Fri, 13 Nov 2020)

  Changed paths:
    R llvm/lib/ExecutionEngine/Orc/Shared/LLVMBuild.txt.rej

  Log Message:
  -----------
  llvmbuildectomy - remove conflict file