Aung Myo a5bf5222f6 update conflic file

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

..

dailysale

update merge cancan

2017-06-27 16:55:56 +06:30

receipt_no

update pull master

2017-06-27 16:48:05 +06:30

saleitem

update pdf and font

2017-06-28 11:50:05 +06:30

shiftsale

update conflic file

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