From dc2744b07806d4dface1e49dc27c0fc0ca445fee Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Fri, 1 Aug 2008 05:00:35 +0000 Subject: [PATCH] --- .../WEB-INF/src/org/adempiere/webui/window/FindWindow.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java index b4359ae89f..1fec5c2c61 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java @@ -373,12 +373,8 @@ public class FindWindow extends Window implements EventListener,ValueChangeListe listhead.setSizable(true); ListHeader lstHColumn = new ListHeader(); -<<<<<<< .mine - lstHColumn.setLabel("Column"); -======= lstHColumn.setLabel(Msg.translate(Env.getCtx(), "AD_Column_ID")); lstHColumn.setWidth("100px"); ->>>>>>> .r5927 ListHeader lstHOperator = new ListHeader(); lstHOperator.setLabel(Msg.getMsg(Env.getCtx(), "Operator"));