kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[ContentBundle,WebBundle] Resolve conflicts

Browse source
This commit is contained in:
Raynald 2014-10-07 14:19:34 +02:00
commit 1b71eed2c5
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
composer.lock generated
View file

@ -4,11 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
<<<<<<< Upstream, based on master
"hash": "5ccdf51f26190addaa3e19007b80c7c7",
=======
"hash": "bb544a40ff3dee1a0907a40f7f944b6b",
>>>>>>> c82e4a2 Latest fix for ContentBundle
"hash": "74b91328cf1144bd4dd96654435e84c7",
"packages": [
{
"name": "ajbdev/authorizenet-php-api",

2
src/Sylius/Bundle/WebBundle/Resources/public/css/backend.css
View file

@ -614,4 +614,4 @@ input[type="file"] {
#sylius-menu-childrens img {
margin-top: 20px;
}
}