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

Document Merge Conflict automatisation #43

Merged
merged 2 commits into from
Aug 1, 2019

Conversation

bastelfreak
Copy link
Member

No description provided.

@bastelfreak bastelfreak added the documentation Documentation label Jul 31, 2019
@bastelfreak bastelfreak added this to the merge conflicts milestone Jul 31, 2019
@bastelfreak bastelfreak requested a review from Flipez July 31, 2019 19:46
@bastelfreak bastelfreak self-assigned this Jul 31, 2019
@bastelfreak bastelfreak merged commit 6505d51 into voxpupuli:master Aug 1, 2019
@bastelfreak bastelfreak deleted the config branch August 1, 2019 07:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants