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

[Console] add missing conflict rule #33030

Merged
merged 1 commit into from Aug 8, 2019

Conversation

@xabbuh
Copy link
Member

commented Aug 8, 2019

Q A
Branch? 4.4
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets
License MIT
Doc PR

The LockableTrait uses the LockFactory introduced in Symfony 4.4.

add missing conflict rule
The LockableTrait uses the LockFactory introduced in Symfony 4.4.

@xabbuh xabbuh added this to the next milestone Aug 8, 2019

@nicolas-grekas

This comment has been minimized.

Copy link
Member

commented Aug 8, 2019

Thank you @xabbuh.

@nicolas-grekas nicolas-grekas merged commit a63df9c into symfony:4.4 Aug 8, 2019

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
fabbot.io Your code looks good.
Details

nicolas-grekas added a commit that referenced this pull request Aug 8, 2019

minor #33030 [Console] add missing conflict rule (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

[Console] add missing conflict rule

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

The LockableTrait uses the LockFactory introduced in Symfony 4.4.

Commits
-------

a63df9c add missing conflict rule

@xabbuh xabbuh deleted the xabbuh:pr-32446 branch Aug 8, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.