Fix conflict
This commit is contained in:
parent
a278feb372
commit
44fc2a6c2e
|
|
@ -69,24 +69,6 @@ import static org.apache.dubbo.config.Constants.DEVELOPMENT_ENVIRONMENT;
|
|||
import static org.apache.dubbo.config.Constants.PRODUCTION_ENVIRONMENT;
|
||||
import static org.apache.dubbo.config.Constants.TEST_ENVIRONMENT;
|
||||
|
||||
import java.net.InetAddress;
|
||||
import java.net.UnknownHostException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.dubbo.common.compiler.support.AdaptiveCompiler;
|
||||
import org.apache.dubbo.common.infra.InfraAdapter;
|
||||
import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
|
||||
import org.apache.dubbo.common.logger.LoggerFactory;
|
||||
import org.apache.dubbo.common.utils.CollectionUtils;
|
||||
import org.apache.dubbo.common.utils.StringUtils;
|
||||
import org.apache.dubbo.config.support.Parameter;
|
||||
import org.apache.dubbo.rpc.model.ApplicationModel;
|
||||
|
||||
|
||||
/**
|
||||
* The application info
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in New Issue