remove conflict data

2018-02-27 14:35:21 +06:30
parent 3e0943275f 4d556cff43
commit adefd8c034
49 changed files with 1989 additions and 363 deletions
--- a/app/controllers/base_waiter_controller.rb
+++ b/app/controllers/base_waiter_controller.rb
@@ -1,4 +1,5 @@
-class BaseWaiterController < ApplicationController  
+class BaseWaiterController < ActionController::Base
+  include LoginVerification  
  layout "waiter"

  #before_action :check_installation