Skip to content

bundles.rst: Conflict resolving clean up #8919

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

Merged
merged 1 commit into from
Dec 22, 2017
Merged

bundles.rst: Conflict resolving clean up #8919

merged 1 commit into from
Dec 22, 2017

Conversation

jivot
Copy link
Contributor

@jivot jivot commented Dec 22, 2017

Removed the closing version tag. Probably was missed during conflict resolving.

Removed the closing version tag. Probably was missed during conflict resolving.
@xabbuh
Copy link
Member

xabbuh commented Dec 22, 2017

Good catch, thanks @jivot.

@xabbuh xabbuh merged commit 6013d55 into symfony:4.0 Dec 22, 2017
xabbuh added a commit that referenced this pull request Dec 22, 2017
This PR was merged into the 4.0 branch.

Discussion
----------

bundles.rst: Conflict resolving clean up

Removed the closing version tag. Probably was missed during conflict resolving.

Commits
-------

6013d55 bundles.rst: Conflict resolving clean up
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants