fixed conflict

2019-12-04 10:37:52 +06:30
parent 937f40e7c1 37380f6bfb
commit 3b5b6c78f3
15 changed files with 82 additions and 108 deletions
--- a/app/controllers/base_oqs_controller.rb
+++ b/app/controllers/base_oqs_controller.rb
@@ -1,5 +1,8 @@
 class BaseOqsController < ActionController::Base
-  include LoginVerification, MultiTenancy
+
+  include MultiTenancy
+  include LoginVerification
+  
  layout "OQS"

  before_action :check_user