resolve conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/24cf3aab Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/24cf3aab Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/24cf3aab Branch: refs/heads/release Commit: 24cf3aab4747fb69864be46b760f02f3169b6612 Parents: cb1df91 Author: jianbai.gbj <jianbai....@alibaba-inc.com> Authored: Tue Oct 17 11:15:53 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Oct 17 15:48:46 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/com/taobao/weex/ui/component/list/WXCell.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/24cf3aab/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java index ebf81b4..925da65 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java @@ -66,8 +66,6 @@ public class WXCell extends WidgetContainer<WXFrameLayout> { private boolean hasLayout = false; - - @Deprecated public WXCell(WXSDKInstance instance, WXDomObject dom, WXVContainer parent, String instanceId, boolean isLazy) { super(instance, dom, parent);
