Fixed conflic in composer.lock

2019-11-13 11:34:34 +01:00 · 2019-11-13 11:34:34 +01:00 · 9f5ab5201b
parent 81aa1c56f3 0e9ab333bf
commit 9f5ab5201b
6 changed files with 4762 additions and 0 deletions
--- a/composer.lock
+++ b/composer.lock
--- a/data/DoctrineORMModule/Proxy/.gitkeep
+++ b/data/DoctrineORMModule/Proxy/.gitkeep
--- a/data/LazyServices/Proxy/.gitkeep
+++ b/data/LazyServices/Proxy/.gitkeep
--- a/data/cache/.gitkeep
+++ b/data/cache/.gitkeep
--- a/data/json/.gitkeep
+++ b/data/json/.gitkeep
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@ -121,6 +121,7 @@ composer install -o


 # Make modules symlinks.
+mkdir -p module/Monarc
 cd module/Monarc
 ln -s ./../../vendor/monarc/core Core
 ln -s ./../../vendor/monarc/backoffice BackOffice