Aung Myo cfa819f985 fixed conflic

2017-10-31 12:13:19 +06:30

..

_commission.json.jbuilder

…

_form.html.erb

fixed conflic

2017-10-31 12:13:19 +06:30

edit.html.erb

…

index.html.erb

…

index.json.jbuilder

…

new.html.erb

…

show.html.erb

…

show.json.jbuilder

…