You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/18 04:17:19 UTC
[41/50] [abbrv] incubator-weex git commit: resolve conflicts
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/edbde500
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/edbde500
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/edbde500
Branch: refs/heads/master
Commit: edbde500e4163a155bc4b1572fe5f637f69bcf88
Parents: 37d62f9
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Tue Oct 17 11:15:53 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Tue Oct 17 15:38:09 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/edbde500/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);