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.

Sign up for GitHub

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

Jump to bottom

Add Conflict Problem #7

Merged
merged 2 commits into from
Mar 27, 2020
Merged

Add Conflict Problem #7

merged 2 commits into from
Mar 27, 2020

Conversation

Landerstraeten
Copy link
Contributor

No description provided.

@Landerstraeten Landerstraeten changed the title Add conflict problem Add Conflict Problem Mar 27, 2020
@Landerstraeten Landerstraeten requested a review from veewee March 27, 2020 10:33
@Landerstraeten Landerstraeten added the enhancement New feature or request label Mar 27, 2020
@Landerstraeten
Copy link
Contributor Author

CI will be fixed in #6

Lander Vanderstraeten added 2 commits March 27, 2020 13:29
@veewee veewee added this to the 1.3.0 milestone Mar 27, 2020
@veewee veewee merged commit daf27c6 into phpro:master Mar 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@veewee veewee Awaiting requested review from veewee

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
1.3.0
Development

Successfully merging this pull request may close these issues.
2 participants
@Landerstraeten @veewee