Skip to content

feat: add 嘀哩嘀哩番剧更新#2079

Merged
DIYgod merged 6 commits into
DIYgod:masterfrom
sunshinenny:master
May 9, 2019
Merged

feat: add 嘀哩嘀哩番剧更新#2079
DIYgod merged 6 commits into
DIYgod:masterfrom
sunshinenny:master

Conversation

@sunshinenny

Copy link
Copy Markdown
Contributor

本地服务器测试可以实现监控

感谢您提供的优秀工具 ^_^

Comment thread package.json Outdated
删除了不必要的改动
@sunshinenny

Copy link
Copy Markdown
Contributor Author

不好意思...操作不大熟练...
到现在还不怎么会使用 Github 的多人协作功能...

这边提示 router.js 有冲突,但是我不知道如何去合并解决...

@DIYgod DIYgod merged commit 26c4df2 into DIYgod:master May 9, 2019
@DIYgod

DIYgod commented May 9, 2019

Copy link
Copy Markdown
Owner

Merged, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants