phyusin bd06e80b37 remove conflict data

2018-03-05 16:24:45 +06:30

..

backhome_controller.rb

…

edit_controller.rb

remove conflict data

2018-03-05 16:24:45 +06:30

home_controller.rb

remove conflict data

2018-03-05 16:24:45 +06:30

print_controller.rb

…