This repository was archived by the owner on Jan 8, 2019. It is now read-only.
Conversation
added 22 commits
August 15, 2015 13:29
Collaborator
|
Shall we merge this PR into master branch? |
Owner
Author
|
@M157q Fine, but we need to solve conflict first |
Collaborator
|
@fntsrlike Do you prefer |
Collaborator
|
@fntsrlike hmm... I think I am gonna try the new feature of GitHub which can solve the conflict in web interface. |
Owner
Author
|
Sounds cool. You can try it (y) |
Owner
Author
|
Have you tried beta version to check it work or not. It is too long ago I develop it, I forget it works or not. |
Collaborator
|
Wait a second. Let me try it. |
Collaborator
|
hmm... It's been a long time since the last time I used this bot. I cannot find my |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.