Merge branch 'ios-bugfix-single-border-radius-conflict' of https://github.com/acton393/incubator-weex into wip-us-0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/436e4090 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/436e4090 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/436e4090 Branch: refs/heads/0.16-dev Commit: 436e4090ac9d4a45b63153bc8309ab18ac724809 Parents: 2252798 335e7ae Author: acton393 <[email protected]> Authored: Thu Sep 21 15:59:33 2017 +0800 Committer: acton393 <[email protected]> Committed: Thu Sep 21 15:59:33 2017 +0800 ---------------------------------------------------------------------- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 ---- ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) ----------------------------------------------------------------------
