From 3034d9d7040f8cf3a845530d5000c7c37a55d22f Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Tue, 12 May 2015 11:51:46 -0400 Subject: Revert "Revert "Merge pull request #1429 from mapbox/travis-setup"" This reverts commit 3ccb0b5610a716b8c2bb602cc52f96bc2fb2ff03. Conflicts: .travis.yml --- scripts/ios/install.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'scripts/ios/install.sh') diff --git a/scripts/ios/install.sh b/scripts/ios/install.sh index 274557c5d7..50f43c26b0 100755 --- a/scripts/ios/install.sh +++ b/scripts/ios/install.sh @@ -3,8 +3,6 @@ set -e set -o pipefail -source ./scripts/travis_helper.sh - mapbox_time "checkout_mason" \ git submodule update --init .mason export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" -- cgit v1.2.1