remove conflict data

2018-03-05 16:24:45 +06:30
parent 4b311789e1 311bef4411
commit bd06e80b37
111 changed files with 3612 additions and 1386 deletions
--- a/app/controllers/base_inventory_controller.rb
+++ b/app/controllers/base_inventory_controller.rb
@@ -1,5 +1,5 @@
 class BaseInventoryController < ActionController::Base
-	include LoginVerification
+  include LoginVerification
 	layout "inventory"

  #before_action :check_installation
@@ -20,5 +20,4 @@ class BaseInventoryController < ActionController::Base
  def shop_detail
    @shop = Shop.first
  end
-
 end