# Conflicts:
#	license/src/main/java/iot/sixiang/license/controller/ResourceContrller.java
#	license/src/main/java/iot/sixiang/license/device/DeviceProtocol.java
#	license/src/main/java/iot/sixiang/license/device/DeviceServerHandler.java
#	license/src/main/java/iot/sixiang/license/event/CreateForwardClientEvent.java
#	license/src/main/java/iot/sixiang/license/event/CreateForwardClientEventHandler.java
#	license/src/main/java/iot/sixiang/license/forward/ForwardClient.java
#	license/src/main/java/iot/sixiang/license/forward/ForwardClientHandler.java
#	license/src/main/java/iot/sixiang/license/net/TcpClient.java
#	license/src/main/java/iot/sixiang/license/net/TcpServer.java
#	license/src/main/java/iot/sixiang/license/util/CommonUtil.java