modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java | 1 - 1 file changed, 1 deletion(-)

New commits: commit 79e0b1b8baf09811d46580d800a788e9d66f05e5 Author: Jay Shaughnessy jshaughn@redhat.com Date: Fri Dec 21 15:18:52 2012 -0500

fix merge issue

diff --git a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java index 343cc25..9e51248 100644 --- a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java +++ b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java @@ -58,7 +58,6 @@ public class JBossASClient { public static final String REMOVE = "remove"; public static final String SYSTEM_PROPERTY = "system-property"; public static final String PERSISTENT = "persistent"; // used by some operations to persist their effects - public static final String REMOVE = "remove";

private ModelControllerClient client;