[all-commits] [llvm/llvm-project] f76279: Fix ReleaseNotes.rst unresolved merge conflict

[Alan Zhao via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: f762798599171efca03964f4371cc8104d2392f9
      https://github.com/llvm/llvm-project/commit/f762798599171efca03964f4371cc8104d2392f9
  Author: Alan Zhao <ayzhao at google.com>
  Date:   2023-05-01 (Mon, 01 May 2023)

  Changed paths:
    M clang/docs/ReleaseNotes.rst

  Log Message:
  -----------
  Fix ReleaseNotes.rst unresolved merge conflict