Skip to content
This repository has been archived by the owner on Jun 3, 2024. It is now read-only.

Fix merge conflicts in PR-201 #383

Merged
merged 7 commits into from
Nov 21, 2018
Merged

Fix merge conflicts in PR-201 #383

merged 7 commits into from
Nov 21, 2018

Conversation

valentijnnieman
Copy link
Contributor

Fixes merge conflicts in #201 - ready to merge

@valentijnnieman valentijnnieman merged commit ce61269 into master Nov 21, 2018
@valentijnnieman valentijnnieman deleted the xblad-patch-1 branch February 1, 2019 15:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants