mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-03-07 14:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 解决merge留下的问题

Browse Source
This commit is contained in:
祝鑫奔 2017-07-18 15:41:18 +08:00
parent 6dd0a1069b
commit 52f97df53f
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/controllers/project.js
View File

@ -139,8 +139,6 @@ class projectController extends baseController {
ctx.body = yapi.commons.resReturn(null, 402, e.message)
}
}
<<<<<<< HEAD
=======
/**
* 获取项目成员列表
@ -182,7 +180,6 @@ class projectController extends baseController {
}
>>>>>>> 2467556d35eca929c40a1ffd1e5d64d047a9fc77
/**
* 添加项目
* @interface /project/get