phyusin adefd8c034 remove conflict data

2018-02-27 14:35:21 +06:30

..

index_bk.html.erb

…

index.html.erb

fixed conflix after pull split bill

2018-02-19 14:21:26 +06:30

show.html.erb

remove conflict data

2018-02-27 14:35:21 +06:30