8000 fix conflicts · msofka/opencv-python@fc0367d · GitHub
[go: up one dir, main page]
Skip to content

Commit fc0367d

< 10000 div class="d-flex gap-2 flex-items-center flex-md-justify-end">Browse files
skvarkskvark
committed
fix conflicts
2 parents 86e87d7 + 4c67d1c commit fc0367d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

‎.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,44 +30,44 @@ matrix:
3030

3131
# default builds for MacOS
3232
- os: osx
33-
osx_image: xcode8.3
33+
osx_image: xcode7.3
3434
env:
3535
- MB_PYTHON_VERSION=2.7
3636
- ENABLE_CONTRIB=0
3737
- os: osx
38-
osx_image: xcode8.3
38+
osx_image: xcode7.3
3939
env:
4040
- MB_PYTHON_VERSION=3.4
4141
- ENABLE_CONTRIB=0
4242
- os: osx
43-
osx_image: xcode8.3
43+
osx_image: xcode7.3
4444
env:
4545
- MB_PYTHON_VERSION=3.5
4646
- ENABLE_CONTRIB=0
4747
- os: osx
48-
osx_image: xcode8.3
48+
osx_image: xcode7.3
4949
env:
5050
- MB_PYTHON_VERSION=3.6
5151
- ENABLE_CONTRIB=0
5252

5353
# Contrib builds for MacOS
5454
- os: osx
55-
osx_image: xcode8.3
55+
osx_image: xcode7.3
5656
env:
5757
- MB_PYTHON_VERSION=2.7
5858
- ENABLE_CONTRIB=1
5959
- os: osx
60-
osx_image: xcode8.3
60+
osx_image: xcode7.3
6161
env:
6262
- MB_PYTHON_VERSION=3.4
6363
- ENABLE_CONTRIB=1
6464
- os: osx
65-
osx_image: xcode8.3
65+
osx_image: xcode7.3
6666
env:
6767
- MB_PYTHON_VERSION=3.5
6868
- ENABLE_CONTRIB=1
6969
- os: osx
70-
osx_image: xcode8.3
70+
osx_image: xcode7.3
7171
env:
7272
- MB_PYTHON_VERSION=3.6
7373
- ENABLE_CONTRIB=1

0 commit comments

Comments
 (0)
0