d28676d89a
Moves the Text Editor 'Resolve Conflict' button closer to data-block selector and with 'Question' icon. Differential Revision: https://developer.blender.org/D9266 Reviewed by Hans Goudey