Open
Conversation
Contributor
klimov-paul
commented
Aug 13, 2019
klimov-paul
commented
| Q | A |
|---|---|
| Is bugfix? | ❌ |
| New feature? | ✔️ |
| Breaks BC? | ❌ |
| Tests pass? | ✔️ |
| Fixed issues | #167 |
Collaborator
|
@vinicius73 Can this be merged? |
Member
|
There are conflicts to solve @J-Brk |
Collaborator
|
@vinicius73 I'm sorry, I missed to notice there was any conflict. Unfortunately it's not showing me what the conflicts are. Can you tell me what the conflict is with this pull request?
|
Collaborator
|
Sorry for the individual commits; I was quickly doing it from the web editor but turns out there was just too much missing. Actually it would have been nicer to make |
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.