Fixed merge conflict in .travis.yml introduced in 687703a75ed741464e15b71a1e576c319865f3fd

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Doc PR        | none
minor #11946 [CI] Fixed merge conflict in .travis.yml (phansys)

This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #11946).

Discussion
----------

[CI] Fixed merge conflict in .travis.yml

Fixed merge conflict in .travis.yml introduced in 687703a75ed741464e15b71a1e576c319865f3fd

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Doc PR        | none

Commits
-------

5238eba Fixed merge conflict in .travis.yml introduced in 687703a75ed741464e15b71a1e576c319865f3fd