Fix merge conflict

This commit is contained in:
wilsonge 2019-08-19 20:53:36 +01:00
parent 3b8ade5bd8
commit 5f348f81b9
No known key found for this signature in database
GPG Key ID: EF81319318FC9D04
1 changed files with 0 additions and 1 deletions

View File

@ -11,7 +11,6 @@ matrix:
fast_finish: true
include:
- php: 5.6
env: RUN_PHPCS="yes"
- php: 7.0
env: RUN_PHPCS="yes"
sudo: true