# Conflicts: # app/controllers/concerns/register_helper.rb # app/controllers/oauth/base_controller.rb |
||
|---|---|---|
| .. | ||
| base_controller.rb | ||
| callbacks_controller.rb | ||
| cas_controller.rb | ||
| educoder_controller.rb | ||
| qq_controller.rb | ||
| wechat_controller.rb | ||
# Conflicts: # app/controllers/concerns/register_helper.rb # app/controllers/oauth/base_controller.rb |
||
|---|---|---|
| .. | ||
| base_controller.rb | ||
| callbacks_controller.rb | ||
| cas_controller.rb | ||
| educoder_controller.rb | ||
| qq_controller.rb | ||
| wechat_controller.rb | ||