Log in / Register
Evergreen
Overview
Code
Bugs
Blueprints
Translations
Answers
Bug #2039750
Comment #2
Comment 2 for bug 2039750
Revision history for this message
Terran McCanna (tmccanna)
wrote
on 2023-11-14
:
#2
I'm getting a merge conflict on the 950 file when I try to apply it to main today.
I'm getting a merge conflict on the 950 file when I try to apply it to main today.
I'm getting a merge conflict on the 950 file when I try to apply it to main today.