Merge branch 'master' of https://github.com/urllib3/urllib3 into Seth…

…MichaelLarson-patch-1
urllib3 · Oct 25, 2018 · 6e2d616 · 6e2d616
2 parents 280f53d + f8d1c78
commit 6e2d616
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/_travis/install.sh b/_travis/install.sh
@@ -7,6 +7,9 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     sw_vers
     brew update || brew update
 
+    # https://github.com/travis-ci/travis-ci/issues/8826
+    brew cask uninstall oclint
+
     brew outdated openssl || brew upgrade openssl
     brew install openssl@1.1