Aung Myo ce8581f892 fixed conflic when pull master item remark

2018-02-26 17:02:46 +06:30

..

apply_void.json.jbuilder

…

cancel_all_void.json.jbuilder

…

edit.html.erb

fixed conflic when pull master item remark

2018-02-26 17:02:46 +06:30

item_void_cancel.json.jbuilder

…

item_void.json.jbuilder

…