Fix conflicts

This commit is contained in:
An Phan 2015-12-24 12:26:55 +08:00
commit 5504750dd7

View file

@ -26,6 +26,10 @@ branches:
only:
- master
cache:
- npm
- composer
before_script:
- composer self-update
- composer install --prefer-source --no-interaction