fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30
parent 858ddfd93b 2010b6a4bb
commit d41d957688
37 changed files with 295 additions and 430 deletions
--- a/app/controllers/settings/commissioners_controller.rb
+++ b/app/controllers/settings/commissioners_controller.rb
@@ -37,7 +37,6 @@ class Settings::CommissionersController < ApplicationController
    unless @commissioner.resigned_date.nil?
      @commissioner.resigned_date = @commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d')
    end
-    # puts params[:from_induty].length
    if (params[:from_induty] != "true")
      respond_to do |format|
        if @commissioner.save