Closed ajay-acer closed 2 years ago
The Resolve conflict button is disabled.
Conflict is because the file name is changed. instructioModal.ejs To instruction.ejs.
File name changed resumed. This resolves the conflict.
The Resolve conflict button is disabled.