Skip to content

feat: add数英网文章及项目专题#2204

Merged
DIYgod merged 5 commits into
DIYgod:masterfrom
occupy5:digitaling
May 22, 2019
Merged

feat: add数英网文章及项目专题#2204
DIYgod merged 5 commits into
DIYgod:masterfrom
occupy5:digitaling

Conversation

@occupy5

@occupy5 occupy5 commented May 22, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@occupy5

occupy5 commented May 22, 2019

Copy link
Copy Markdown
Contributor Author

#1633

@DIYgod DIYgod left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/digitaling/index 的文档被删了

有较多冲突,请 merge 下最新 master 分支

@occupy5

occupy5 commented May 22, 2019

Copy link
Copy Markdown
Contributor Author

已merge最新master分支

Comment thread lib/router.js
router.get('/dsndsht23', require('./routes/dsndsht23/index'));

// 数英网最新文章
router.get('/digitaling/index', require('./routes/digitaling/index'));

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个之前已经有了,重复

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed

@DIYgod DIYgod merged commit 40511d1 into DIYgod:master May 22, 2019
@DIYgod

DIYgod commented May 22, 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