Fix merge conflict
This commit is contained in:
parent
3b8ade5bd8
commit
5f348f81b9
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue