Merge, fix conflict

2017-03-31 03:10:25 +08:00 · 2017-03-31 03:10:25 +08:00 · d28dde8719
commit d28dde8719
parent f64b4f8999 abb04432fb
26 changed files with 262 additions and 55 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,8 +1,12 @@
 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: