mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 09:45:32 +00:00
Code Issues Releases Wiki Activity

Fix unnoticed merge conflict

Browse source
This commit is contained in:
David Cernat 2016-12-20 05:25:31 +02:00
parent bf0a96d552
commit ab238e07c4
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
.travis.yml
View file

@ -64,24 +64,15 @@ script:
- if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
- if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
- if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi
<<<<<<< HEAD
#notifications: #notifications:
# recipients:
# - corrmage+travis-ci@gmail.com
# email: # email:
# recipients:
# - corrmage+travis-ci@gmail.com
# on_success: change # on_success: change
# on_failure: always # on_failure: always
======= # irc:
notifications: # channels:
email: # - "chat.freenode.net#openmw"
recipients: # on_success: change
- corrmage+travis-ci@gmail.com # on_failure: always
on_success: change # use_notice: true
on_failure: always
irc:
channels:
- "chat.freenode.net#openmw"
on_success: change
on_failure: always
use_notice: true
>>>>>>> refs/heads/pr/114