# Conflicts:
#	java/redpacket.properties
#	lua-ui/config/xjd-ui.js
#	lua-ui/config/xyqb-ui.js

# Conflicts:
#	java/account-center-helper.properties
#	java/account-center.properties
#	java/baitiao-guangda.properties
#	java/baitiao-op-backend.properties
#	java/baitiao-zhitou.properties
#	java/baitiao.properties
#	java/black-hole.properties
#	java/btzt.properties
#	java/cash-loan-flow.properties
#	java/check-accounts.properties
#	java/clotho.properties
#	java/customer_helpdesk.properties
#	java/data-taurus.properties
#	java/di-ting.properties
#	java/du-jiang-yan.properties
#	java/finance-api.properties
#	java/financial-system.properties
#	java/fund-manage.properties
#	java/gu-bei.properties
#	java/gyxd.properties
#	java/han-gu-guan.properties
#	java/hfbank.properties
#	java/huarong.properties
#	java/jian-men-guan.properties
#	java/mall-canal.properties
#	java/mall-settlement.properties
#	java/merchant-backend.properties
#	java/msg.properties
#	java/notify.properties
#	java/pinjamancepat-credit-review.properties
#	java/pinjamancepat.properties
#	java/redpacket.properties
#	java/score.properties
#	java/silk-road-backman.properties
#	java/silk-road-caller.properties
#	java/silk-road-eureka.properties
#	java/silk-road.properties
#	java/spider-center.properties
#	java/traffic-webapp.properties
#	java/urge_dispatcher.properties
#	java/user-credit-schedule.properties
#	java/user-credit.properties
#	java/wechat-config.properties
#	java/xyqb-backend.properties
#	java/xyqb-btzt-internal.properties
#	java/xyqb-btzt.properties
#	java/xyqb-display.properties
#	java/xyqb-mall.properties
#	java/xyqb-offline.properties
#	java/xyqb-quartz.properties
#	java/xyqb-user2-query.properties
#	java/xyqb-user2.properties
#	java/xyqb.properties
#	java/zero-gateway-zuul.properties