Fix conflict

ezecosystem · Jan 22, 2019 · 8dc6291 · 8dc6291
2 parents 239e350 + 0db4a12
commit 8dc6291
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.platform.app.yaml b/.platform.app.yaml
@@ -24,7 +24,7 @@ mounts:
 hooks:
     build: |
         set -e
-        composer create-project ezsystems/ezplatform:v2.3.2.2 --prefer-dist --no-progress --no-interaction --no-scripts
+        composer create-project ezsystems/ezplatform:dev-master --prefer-dist --no-progress --no-interaction --no-scripts
         curl -o tests/provisioning/wrap.php https://raw.githubusercontent.com/Plopix/symfony-bundle-app-wrapper/master/wrap-bundle.php
         WRAP_APP_DIR=./ezplatform WRAP_BUNDLE_DIR=./ php tests/provisioning/wrap.php
         cd ezplatform

diff --git a/composer.json b/composer.json
@@ -35,7 +35,6 @@
         "ext-json": "*"
     },
     "require-dev": {
-        "roave/security-advisories": "dev-master",
         "squizlabs/php_codesniffer": "^3.2",
         "phpmd/phpmd": "^2.6",
         "friendsofphp/php-cs-fixer": "^2.10",