fix merge conflicts

This commit is contained in:
Niels Vanpachtenbeke 2022-02-10 17:50:30 +01:00
parent afc57c7fde
commit a42dd252fb

View File

@ -13,14 +13,6 @@ jobs:
illuminate_version: [6.*, 8.*]
stability: [prefer-lowest, prefer-stable]
exclude:
- php: 8.0
stability: prefer-lowest
- php: 8.1
include:
- php: 8.1
illuminate_version: ^8.67
stability: prefer-stable
# Exclude unsupported combination
# https://laravel.com/docs/8.x/releases#support-policy
- illuminate_version: 6.*
@ -36,11 +28,10 @@ jobs:
# "Added PHP 8.1 Support from v8.67.0"
- illuminate_version: ^8.67.0
php: 8.1
stability: ''
stability: prefer-stable
- illuminate_version: ^8.67.0
php: 8.1
stability: --prefer-lowest
stability: prefer-lowest
name: P${{ matrix.php }} - ${{ matrix.illuminate_version }} - ${{ matrix.stability }}