Skip to content

Adding link to GH discussions to contributing.md #25

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.

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

Merged
merged 5 commits into from
Jan 14, 2021

Conversation

jukent
Copy link
Contributor

@jukent jukent commented Jan 14, 2021

No description provided.

@brian-rose
Copy link
Member

I think this looks great, and we should close #24 and merge this one instead.

Copy link
Collaborator

@kmpaul kmpaul left a comment

Choose a reason for hiding this comment

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

This includes changes from #24, too. We should merge this after #24...and there will probably be conflicts.

@jukent
Copy link
Contributor Author

jukent commented Jan 14, 2021

This includes changes from #24, too. We should merge this after #24...and there will probably be conflicts.

Sorry about including those changes -- I pulled them in so that I could build the site. I think since GitHub knows they are from the same source we won't have conflicts (?). If we do I can fix them stat.

Next time - if we do have conflicts - I will make sure I'm in a different branch first.

@kmpaul
Copy link
Collaborator

kmpaul commented Jan 14, 2021

No conflicts with #24. We can move forward with this PR whenever it is approved.

Copy link
Collaborator

@kmpaul kmpaul left a comment

Choose a reason for hiding this comment

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

I think this looks good.

@jukent
Copy link
Contributor Author

jukent commented Jan 14, 2021

No conflicts with #24. We can move forward with this PR whenever it is approved.

Merging now

@jukent jukent merged commit edbdefc into ProjectPythia:main Jan 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants