提交 fc0367d8 编写于 作者: O Olli-Pekka Heinisuo

fix conflicts

......@@ -30,44 +30,44 @@ matrix:
# default builds for MacOS
- os: osx
osx_image: xcode8.3
osx_image: xcode7.3
env:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=0
- os: osx
osx_image: xcode8.3
osx_image: xcode7.3
env:
- MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=0
- os: osx
osx_image: xcode8.3
osx_image: xcode7.3
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0
- os: osx
osx_image: xcode8.3
osx_image: xcode7.3
env:
- MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=0
# Contrib builds for MacOS
- os: osx
osx_image: xcode8.3
osx_image: xcode7.3
env:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=1
- os: osx
osx_image: xcode8.3
osx_image: xcode7.3
env:
- MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=1
- os: osx
osx_image: xcode8.3
osx_image: xcode7.3
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1
- os: osx
osx_image: xcode8.3
osx_image: xcode7.3
env:
- MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=1
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册