update conflic for pull master

2018-02-23 14:58:35 +06:30
parent 8069ac15ca 77a66d726b
commit ac47501e01
19 changed files with 284 additions and 125 deletions
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -1,5 +1,4 @@
-class BaseOrigamiController < ActionController::Base
-  include LoginVerification
+class BaseOrigamiController < ApplicationController
  layout "origami"

  # before_action :checkin_process