fix conflict 20200312

config/routes.rb

@@ -6,5 +6,8 @@ Rails.application.routes.draw do
   root 'top_page#index'
   root 'top_page#index'
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
   resources :top_page
   resources :top_page
+<<<<<<< HEAD
   resources :jobs, :only => [:show, :index]
   resources :jobs, :only => [:show, :index]
+=======
+>>>>>>> master
 end
 end