# Conflicts:
#	application/api/service/ConvertCouponService.php
#	public/app/dist/index.html
#	public/app/dist/static/css/app.0edbd13da25a721a0911b15c5629dd29.css
#	public/app/dist/static/css/app.6bce11bfec219b9feb2318a9583a5b3d.css
#	public/app/dist/static/css/app.6e04b340d6b65dbf7239e5ffe12bd195.css