Fix last commit

2017-03-31 03:16:54 +08:00 · 2017-03-31 03:16:54 +08:00 · 5de66ad17a
commit 5de66ad17a
parent d28dde8719
2 changed files with 0 additions and 13 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,12 +1,8 @@
 language: objective-c
-<<<<<<< HEAD
 osx_image: xcode8.3
 branches:
  only:
    - develop
-=======
-osx_image: xcode8.2
->>>>>>> uiimprovement
 before_install:
    - echo -e "machine github.com\n  login $GITHUB_ACCESS_TOKEN" >> ~/.netrc
 script: