Conflicts: app/controllers/admin/import_data_controller.rb Conflicts: app/controllers/admin/import_data_controller.rb app/views/admin/import_data/get_teacher_data.html.erb |
||
|---|---|---|
| .. | ||
| get_teacher_data.html.erb | ||
Conflicts: app/controllers/admin/import_data_controller.rb Conflicts: app/controllers/admin/import_data_controller.rb app/views/admin/import_data/get_teacher_data.html.erb |
||
|---|---|---|
| .. | ||
| get_teacher_data.html.erb | ||