merge conflict

2017-06-12 10:55:04 +06:30
parent e1481eb591
commit b6bba9ecd4
2 changed files with 9 additions and 25 deletions
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -17,12 +17,7 @@ class Origami::HomeController < BaseOrigamiController
  	@booking_orders = Order.get_booking_order_table()
  	@booking_rooms = Order.get_booking_order_rooms()
  	@orders = Order.get_orders()
-<<<<<<< HEAD
  end  
-=======
-
-  end
->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3

  def item_show
  	selection(params[:booking_id],1)