Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

示例博客添加新栏 #78

Merged
merged 3 commits into from
Jul 17, 2020
Merged

示例博客添加新栏 #78

merged 3 commits into from
Jul 17, 2020

Conversation

Colsrch
Copy link
Member

@Colsrch Colsrch commented Jul 16, 2020

版本更新到3.0,添加一个新的栏目,并将原2.5-2.6栏目中已升级为3.0的博主移至该栏目,原2.5-2.6栏目中将某些不能访问的站点或已更换主题的站点删除

@Reqwey
Copy link
Contributor

Reqwey commented Jul 16, 2020

你帮别人也升了级啊

@Reqwey Reqwey requested a review from xaoxuu July 16, 2020 12:49
@Reqwey
Copy link
Contributor

Reqwey commented Jul 16, 2020

改动太大,叫@xaoxuu亲自审核吧

@Colsrch
Copy link
Member Author

Colsrch commented Jul 16, 2020

哈哈哈😄

@xaoxuu
Copy link
Member

xaoxuu commented Jul 17, 2020

有冲突

@Colsrch
Copy link
Member Author

Colsrch commented Jul 17, 2020

有冲突

好像是因为上一两个Pr是增加博客和删减博客,然后这里没写上

@xaoxuu
Copy link
Member

xaoxuu commented Jul 17, 2020

你update一下

@Colsrch
Copy link
Member Author

Colsrch commented Jul 17, 2020

好了,你再试试

@xaoxuu
Copy link
Member

xaoxuu commented Jul 17, 2020

还是不行

@xaoxuu
Copy link
Member

xaoxuu commented Jul 17, 2020

你要拉一下最新的代码

@Colsrch Colsrch marked this pull request as draft July 17, 2020 01:03
@Colsrch
Copy link
Member Author

Colsrch commented Jul 17, 2020

@xaoxuu 可以了

@MHuiG MHuiG marked this pull request as ready for review July 17, 2020 03:44
@MHuiG MHuiG merged commit 1241417 into volantis-x:master Jul 17, 2020
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.

None yet

4 participants