Fix conflict marker in project diff view (#26466)

Closes #ISSUE

Release Notes:

- N/A

Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
28f33d0103Conrad Irwin committed on 3/11/2025, 10:27:25 PM· committed by GitHubparent55a90f5
1 file changedLine totals unavailable