Closed YangQi007 closed 1 month ago
@YangQi007 it's better not to combine multiple tasks in a single PR. Sorry I should have clarified that removing index.html should be done in a separate PR. It's probably more trouble than it's worth to undo it now, but just for future reference.
I'm not sure what's causing the conflicts though. Can you try merging main from GitHub and see if that fixes it?
No, my bad. I should have thought about that. I just reverted that commit. Now the conflict should be resolved.
Easy enough, thanks!
@YangQi007 it's better not to combine multiple tasks in a single PR. Sorry I should have clarified that removing index.html should be done in a separate PR. It's probably more trouble than it's worth to undo it now, but just for future reference.
I'm not sure what's causing the conflicts though. Can you try merging main from GitHub and see if that fixes it?