Aung Myo a5bf5222f6 update conflic file

2017-06-30 14:19:05 +06:30

..

_shift_sale_report_filter.html.erb

update shift sale

2017-06-30 13:32:56 +06:30

index.html.erb

update conflic file

2017-06-30 14:19:05 +06:30

index.xls.erb

update shift sale

2017-06-30 13:32:56 +06:30