# Conflicts:
#	liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java
#	liquidnet-bus-service/liquidnet-service-sweet/docu/redis_queue_create.txt

# Conflicts:
#	liquidnet-bus-api/pom.xml
#	liquidnet-bus-do/pom.xml

Pre

See merge request !49

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java