Skip to content

Conversation

@Naman9639
Copy link

No description provided.

@oliverphardman
Copy link
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.

@Naman9639
Copy link
Author

Sorry I didn't noticed that.
Sure I am okay with it.

@rahuldecoded
Copy link
Owner

Resolve the merge conflict.

Copy link
Contributor

@oliverphardman oliverphardman left a comment

Choose a reason for hiding this comment

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

Copy the jam facts from the current master and put them in here.

@Naman9639
Copy link
Author

I am not able to resolve the conflict.

@oliverphardman
Copy link
Contributor

@Naman9639 Fork the current master and then copy my facts into it.

@ghost ghost added the hacktoberfest label Oct 16, 2017
@oliverphardman
Copy link
Contributor

I have resolved the merge conflict in PR #112. Please close this PR @rahuldecoded.

@oliverphardman
Copy link
Contributor

@rahuldecoded Please close this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants