for pull

2017-08-21 16:33:59 +06:30
parent 25e6039a9f 618f5f3b7c
commit 8c6f06a667
28 changed files with 544 additions and 67 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,12 @@ require 'sidekiq/web'

 Rails.application.routes.draw do

+<<<<<<< HEAD
  
+=======
+  resources :commissions
+  resources :commissioners
+>>>>>>> 618f5f3b7c13500a65f89db46309e2a28daf5c8f
  root 'home#index'
  mount Sidekiq::Web => '/kiq'