Open
Conversation
Contributor
|
Hey there, I actually already added jam facts in #29. After a maintainer merges my PR we can resolve the conflicts and add your facts next to mine. |
Author
|
Sorry I didn't noticed that. |
Owner
|
Resolve the merge conflict. |
oliverphardman
suggested changes
Oct 15, 2017
Contributor
oliverphardman
left a comment
oliverphardman
left a comment
There was a problem hiding this comment.
Copy the jam facts from the current master and put them in here.
Author
|
I am not able to resolve the conflict. |
Contributor
|
@Naman9639 Fork the current master and then copy my facts into it. |
ghost
added
the
Merged
Contributor
|
I have resolved the merge conflict in PR #112. Please close this PR @rahuldecoded. |
Contributor
|
@rahuldecoded Please close this PR. |
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.
No description provided.