mirror of
https://github.com/matthiasmullie/minify.git
synced 2025-02-22 10:44:41 +01:00
Missed a merge conflict...
This commit is contained in:
parent
cad5d7f21f
commit
61625a6bcd
@ -21,15 +21,10 @@ install:
|
||||
- IF NOT EXIST C:\tools\php (cinst -y php)
|
||||
- echo extension_dir=ext > C:\tools\php\php.ini
|
||||
- echo extension=php_openssl.dll >> C:\tools\php\php.ini
|
||||
<<<<<<< HEAD
|
||||
# install composer
|
||||
- IF NOT EXIST vendor (php -r "readfile('https://getcomposer.org/installer');" | php & php composer.phar --prefer-source install)
|
||||
=======
|
||||
- echo extension=php_mbstring.dll >> C:\tools\php\php.ini
|
||||
# install composer
|
||||
- IF NOT EXIST vendor (php -r "readfile('https://getcomposer.org/installer');" | php & php composer.phar --prefer-source install)
|
||||
- tests\convert_symlinks_to_windows_style.sh
|
||||
>>>>>>> GinoPane-master
|
||||
|
||||
test_script:
|
||||
- vendor\bin\phpunit
|
||||
|
Loading…
x
Reference in New Issue
Block a user