You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/11/24 23:06:40 UTC

svn commit: r1205993 - /karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java

Author: iocanel
Date: Thu Nov 24 22:06:39 2011
New Revision: 1205993

URL: http://svn.apache.org/viewvc?rev=1205993&view=rev
Log:
[KARAF-1035] Fixed a conflict.

Modified:
    karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java

Modified: karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java?rev=1205993&r1=1205992&r2=1205993&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java (original)
+++ karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java Thu Nov 24 22:06:39 2011
@@ -1,7 +1,7 @@
 package org.apache.karaf.shell.config;
 
 import java.util.Dictionary;
-import org.apache.felix.gogo.commands.Option;
+import org.apache.karaf.shell.commands.Option;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;