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

url-loader can be installed in version 1 and 2 #596 #599

Merged
merged 1 commit into from
Aug 9, 2019
Merged

url-loader can be installed in version 1 and 2 #596 #599

merged 1 commit into from
Aug 9, 2019

Conversation

gustawdaniel
Copy link
Contributor

@gustawdaniel gustawdaniel commented Jun 28, 2019 •
edited by weaverryan
Loading

Fixes #596

@gustawdaniel gustawdaniel mentioned this pull request Jun 28, 2019
Closed
@Lyrkan Lyrkan mentioned this pull request Jun 28, 2019
Closed
@Lyrkan
Copy link
Collaborator

Lyrkan commented Jul 24, 2019

Hi @gustawdaniel,

Would you be able to rebase and run yarn again to fix the yarn.lock conflict?

@gustawdaniel
Copy link
Contributor Author

I can't because I removed my fork. Probably simplest solution is allow to made this change manually by somebody who can merge.

https://help.github.com/en/articles/resolving-a-merge-conflict-on-github

This is only replace

    "url-loader": "^1.0.1",

by

    "url-loader": "^1.0.1 || ^2.0.1",

in package.json

@weaverryan
Copy link
Member

Thank you @gustawdaniel.

@weaverryan weaverryan merged commit 5397ff7 into symfony:master Aug 9, 2019
weaverryan added a commit that referenced this pull request Aug 9, 2019
@weaverryan
minor #599 url-loader can be installed in version 1 and 2 #596 (gusta…
70e387b 
…wdaniel)

This PR was merged into the master branch.

Discussion
----------

url-loader can be installed in version 1 and 2 #596

Fixes #596

Commits
-------

5397ff7 url-loader can be installed in version 1 and 2 #596
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lyrkan Lyrkan Lyrkan 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.

upgrade packages
3 participants
@gustawdaniel @Lyrkan @weaverryan