8000 [DoctrineBridge] Fix exception message after misresolved merge by chalasr · Pull Request #19754 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DoctrineBridge] Fix exception message after misresolved merge #19754

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
Merged
merged 1 commit into from
Aug 27, 2016
Merged

[DoctrineBridge] Fix exception message after misresolved merge #19754

merged 1 commit into from
Aug 27, 2016

Conversation

chalasr
Copy link
Member
@chalasr chalasr commented Aug 26, 2016
Q A
Branch? 2.8
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets n/a
License MIT
Doc PR n/a

@chalasr chalasr force-pushed the fix_deprecation_entityprovider branch from 2ff9ead to 437e0cb Compare August 26, 2016 23:58
@chalasr chalasr force-pushed the fix_deprecation_entityprovider branch from 437e0cb to b367d39 Compare August 27, 2016 00:00
@HeahDude
Copy link
Contributor

👍

Status: reviewed

@fabpot
Copy link
Member
fabpot commented Aug 27, 2016

Thank you @chalasr.

@fabpot fabpot merged commit b367d39 into symfony:2.8 Aug 27, 2016
fabpot added a commit that referenced this pull request Aug 27, 2016
@fabpot
minor #19754 [DoctrineBridge] Fix exception message after misresolved…
2980fb8 
… merge (chalasr)

This PR was merged into the 2.8 branch.

Discussion
----------

[DoctrineBridge] Fix exception message after misresolved merge

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

Commits
-------

b367d39 [DoctrineBridge] Fix exception message and tests after misresolved merge
@chalasr chalasr deleted the fix_deprecation_entityprovider branch August 27, 2016 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
DoctrineBridge Status: Reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chalasr @HeahDude @fabpot @carsonbot
0