fix merge
This commit is contained in:
parent
400a8e65d3
commit
2d87fd320d
@ -16,11 +16,6 @@ matrix:
|
|||||||
- php: 5.6
|
- php: 5.6
|
||||||
env: COVERAGE=1
|
env: COVERAGE=1
|
||||||
allow_failures:
|
allow_failures:
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
- php: 7.0
|
|
||||||
- php: 7.1
|
|
||||||
>>>>>>> branch 'php72_support_object_classes' of https://github.com/SailorMax/PHPWord
|
|
||||||
- php: 7.2
|
- php: 7.2
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user