search

XMOJ-Script-dev / XMOJ-Script-old

XMOJ增强脚本
https://web.xmoj-bbs.tech
GNU General Public License v3.0
0 stars 0 forks source link

Dev #27

Closed langningchen closed 1 year ago

langningchen commented 1 year ago

@PythonSmall-Q 解决 conflict 然后 merge ，我解决不了，没有权限

langningchen commented 1 year ago

这也是为了接手

langningchen commented 1 year ago

这样能 Deploy

PythonSmall-Q commented 1 year ago

我没看懂哪里conflict了

langningchen commented 1 year ago

我根本看不到

langningchen commented 1 year ago

没有权限

![Uploading image.png…]()

PythonSmall-Q commented 1 year ago

image

langningchen commented 1 year ago

第四行，还有23~27全删掉

langningchen commented 1 year ago

解决了吗？

PythonSmall-Q commented 1 year ago

fixed

langningchen commented 1 year ago

没有啊

PythonSmall-Q commented 1 year ago

image master长这个样子

langningchen commented 1 year ago

我猜你是不是只是 Marked as resolved ，没有 Commit changes

langningchen commented 1 year ago

啊啊啊？什么？

langningchen commented 1 year ago

我说4和23~27删掉，中间的怎么也删了？？？

PythonSmall-Q commented 1 year ago

好了

PythonSmall-Q commented 1 year ago

直接修改master成你的文件的样子

langningchen commented 1 year ago

OK