Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge

This commit is contained in:
troosan 2017-12-29 20:27:05 +01:00
parent 400a8e65d3
commit 2d87fd320d
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -16,11 +16,6 @@ matrix:
- php: 5.6
env: COVERAGE=1
allow_failures:
<<<<<<< HEAD
=======
- php: 7.0
- php: 7.1
>>>>>>> branch 'php72_support_object_classes' of https://github.com/SailorMax/PHPWord
- php: 7.2
cache: