compile

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/IconFrameLayout.java b/source/workspace/EverFolder/src/com/yuji/ef/IconFrameLayout.java
index 3910151..5b3b56b 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/IconFrameLayout.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/IconFrameLayout.java
@@ -130,11 +130,7 @@ public class IconFrameLayout extends FrameLayout implements OnLongClickListener
                        LabelIconView v = getView(sx, sy, target, labelIconViewList, true);
                        LabelIconView obj = (LabelIconView) v;
 
-<<<<<<< HEAD
-                       int size = labelIconViewList.size();
-                       
-=======
->>>>>>> a7c7412937d340c57e47c9a85147620b8ca8b5e2
+                       //int size = labelIconViewList.size();
                        if (target == null) {
                                target = obj;
                        }