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.

Sign up for GitHub

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

Jump to bottom

上次merge/push时候没有解决好冲突 #40

Closed
hywang1985 opened this issue Jun 15, 2016 · 3 comments
Closed

上次merge/push时候没有解决好冲突 #40

hywang1985 opened this issue Jun 15, 2016 · 3 comments

Comments

@hywang1985
Copy link

请参照API包里的文件。谢谢。
@hywang1985
Copy link
Author

这次commit没有合并好。
0fcc780

@hywang1985
Copy link
Author

另外我发现除了tokenManager以外又多了一套Token api. 是不是重复了？
由Moyq5贡献的，请看包weixin.popular.support.token下的代码。

@liyiorg
Copy link
Owner

liyiorg commented Jun 15, 2016

上次合并的代码有点问题，未做处理，源码研究，使用 2.8.0 tag 的版本。

@liyiorg liyiorg closed this as completed Nov 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@hywang1985 @liyiorg