Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

remove AsseticBundle after broken merge #1063

Merged
merged 1 commit into from
Apr 22, 2017
Merged

remove AsseticBundle after broken merge #1063

merged 1 commit into from
Apr 22, 2017

Conversation

xabbuh
Copy link
Member

@xabbuh xabbuh commented Apr 21, 2017

This will fix #1062.

chalasr
chalasr approved these changes Apr 21, 2017
View reviewed changes
Copy link
Member

@chalasr chalasr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@bocharsky-bw
Copy link
Contributor

I think you have to regenerate composer.lock file. Actually, composer remove symfony/assetic-bundle should do the trick.

@fabpot
Copy link
Member

fabpot commented Apr 22, 2017

Thank you @xabbuh.

@fabpot fabpot merged commit 0164e6f into symfony:2.8 Apr 22, 2017
fabpot added a commit that referenced this pull request Apr 22, 2017
@fabpot
bug #1063 remove AsseticBundle after broken merge (xabbuh)
cee3655 
This PR was merged into the 2.8 branch.

Discussion
----------

remove AsseticBundle after broken merge

This will fix #1062.

Commits
-------

0164e6f remove AsseticBundle after broken merge
@xabbuh xabbuh deleted the issue-1062 branch April 22, 2017 06:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Pierstoval Pierstoval Pierstoval approved these changes

@chalasr chalasr chalasr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@xabbuh @bocharsky-bw @fabpot @Pierstoval @chalasr