Skip to content
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

Add instructions for fixing poetry.lock conflicts #1391

Merged
merged 5 commits into from
Oct 5, 2022
Merged

Add instructions for fixing poetry.lock conflicts #1391

merged 5 commits into from
Oct 5, 2022

Conversation

mazen-r
Copy link
Contributor

@mazen-r mazen-r commented Oct 5, 2022

Closes #1384

Description

  • Add instructions for fixing poetry.lock conflicts in CONTRIBUITING.md file.

CONTRIBUTING.md Outdated Show resolved Hide resolved
mazen-r and others added 2 commits October 5, 2022 21:26
Co-authored-by: Brylie Christopher Oxley <brylie@amble.fi>
CONTRIBUTING.md Outdated Show resolved Hide resolved
Co-authored-by: Brylie Christopher Oxley <brylie@amble.fi>
Copy link
Member

@brylie brylie left a comment

Choose a reason for hiding this comment

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

Great work!

@brylie brylie merged commit 2748137 into CiviWiki:develop Oct 5, 2022
@brylie
Copy link
Member

brylie commented Oct 5, 2022

@all-contributors please add @mazen-r for docs

@allcontributors
Copy link
Contributor

@brylie

I've put up a pull request to add @mazen-r! 🎉

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.

Add instructions for fixing poetry.lock conflicts
2 participants