FIX merge

config/routes.rb

@@ -8,7 +8,7 @@ Rails.application.routes.draw do
   get 'auth/qq/callback', to: 'oauth/qq#create'
   get 'auth/failure', to: 'oauth/base#auth_failure'
 
-  
+
 
   resources :edu_settings
   scope '/api' do
@@ -24,7 +24,6 @@ Rails.application.routes.draw do
     put    'commons/unhidden',    to: 'commons#unhidden'
     delete 'commons/delete',      to: 'commons#delete'
 
-<<<<<<< HEAD
     resources :project_categories, only: [:index, :show]
     resources :project_languages, only: [:index, :show]
     resources :ignores, only: [:index, :show]
@@ -76,70 +75,6 @@ Rails.application.routes.draw do
     #
     #
     # end
-=======
-    resources :jupyters do 
-      collection do
-        get :save_with_tpi
-        get :save_with_tpm
-        get :get_info_with_tpi
-        get :get_info_with_tpm
-        get :reset_with_tpi
-        get :reset_with_tpm
-      end
-    end
-    
-    resources :memos do
-      member do
-        post :sticky_or_cancel
-        post :hidden
-        get :more_reply
-      end
-
-      collection do
-        post :reply
-      end
-    end
-
-    resources :item_banks do
-
-    end
-    
-
-    resources :hacks, path: :problems,  param: :identifier do
-      collection do
-        get :unpulished_list
-      end
-      member do
-        post :publish
-        post :cancel_publish
-        get :start
-        post :update_set
-        delete :delete_set
-      end
-      resources :comments do
-        post :reply
-      end
-    end
-
-    resources :hack_user_lastest_codes, path: :myproblems,  param: :identifier do
-      member do
-        post :update_code
-        get :code_debug
-        get :code_submit
-        match :listen_result, :via => [:get, :post]
-        get :result
-        get :submit_records
-        post :restore_initial_code
-        post :sync_code
-      end
-
-      collection do
-        get :record_detail
-      end
-
-
-    end
->>>>>>> dev_aliyun
 
 
     # resources :tem_tests