MillionHeroes icon indicating copy to clipboard operation
MillionHeroes copied to clipboard

Published 20 hours ago • verified publisher icon wuditken

Test

Open NyanCat12 opened this issue 7 years ago • 2 comments

处理了冲突

NyanCat12 avatar Jan 11 '18 13:01 NyanCat12

我这边还是显示冲突

This branch has conflicts that must be resolved Use the web editor or thecommand line to resolve conflicts. Conflicting files

wuditken avatar Jan 11 '18 13:01 wuditken

你拉取的是最新代码吗？

wuditken avatar Jan 11 '18 13:01 wuditken