[all-commits] [llvm/llvm-project] d5a3cc: [libc++] Fix merge-conflict in .clang-format

[philnik777 via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: d5a3cc1d88d888e38633eb55e2afadb4cf788000
      https://github.com/llvm/llvm-project/commit/d5a3cc1d88d888e38633eb55e2afadb4cf788000
  Author: Nikolas Klauser <nikolasklauser at berlin.de>
  Date:   2022-07-28 (Thu, 28 Jul 2022)

  Changed paths:
    M libcxx/.clang-format

  Log Message:
  -----------
  [libc++] Fix merge-conflict in .clang-format