exyte/Macaw
1
1
Fork 0
mirror of https://github.com/exyte/Macaw.git synced 2024-09-11 13:15:35 +03:00
Code Issues Projects Releases Wiki Activity

Removing orig file

Browse Source
This commit is contained in:
Viktor Sukochev 2017-01-16 16:46:30 +07:00
parent 08b4e12ebd
commit a05516495b
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml.orig
View File

@ -1,16 +0,0 @@
language: objective-c
osx_image: xcode8.2
branches:
only:
- master
before_script:
- brew update
- brew outdated carthage || brew upgrade carthage
- carthage update --platform iOS
script:
<<<<<<< HEAD
set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.0' | xcpretty;
=======
set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' | xcpretty;
>>>>>>> parent of d8eb2d2... Macaw project update to utilise carthage dependencies