From d36e386e1e33091616bc004bc52be897d91393e0 Mon Sep 17 00:00:00 2001 From: "Jason T. Greene" Date: Mon, 30 Apr 2012 23:49:34 -0500 Subject: [PATCH] Fix conflict --- .../main/java/org/jboss/as/osgi/parser/OSGiSubsystemAdd.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/osgi/service/src/main/java/org/jboss/as/osgi/parser/OSGiSubsystemAdd.java b/osgi/service/src/main/java/org/jboss/as/osgi/parser/OSGiSubsystemAdd.java index 1d68fadf8347..d6dfc85a4e30 100644 --- a/osgi/service/src/main/java/org/jboss/as/osgi/parser/OSGiSubsystemAdd.java +++ b/osgi/service/src/main/java/org/jboss/as/osgi/parser/OSGiSubsystemAdd.java @@ -54,8 +54,6 @@ import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceTarget; -import static org.jboss.as.osgi.OSGiLogger.LOGGER; - /** * OSGi subsystem operation handler. *