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

Fix conflit secret error #165

Merged
merged 1 commit into from
Jun 23, 2017
Merged

Fix conflit secret error #165

merged 1 commit into from
Jun 23, 2017

Conversation

Yancey1989
Copy link
Collaborator

Fixed #163

typhoonzero
typhoonzero approved these changes Jun 23, 2017
View reviewed changes
Copy link
Collaborator

@typhoonzero typhoonzero left a comment

Choose a reason for hiding this comment

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

LGTM

@Yancey1989 Yancey1989 merged commit 3bf910d into PaddlePaddle:develop Jun 23, 2017
@Yancey1989 Yancey1989 deleted the fix163 branch June 23, 2017 02:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@typhoonzero typhoonzero typhoonzero approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Yancey1989 @typhoonzero