Conflicts: app/controllers/managements_controller.rb config/routes.rb |
||
|---|---|---|
| .. | ||
| account.js | ||
| application.js | ||
| base_edu.js | ||
| course.js | ||
| homework.js | ||
| management.js | ||
| shixun.js | ||
| syllabus.js | ||
| user.js | ||
Conflicts: app/controllers/managements_controller.rb config/routes.rb |
||
|---|---|---|
| .. | ||
| account.js | ||
| application.js | ||
| base_edu.js | ||
| course.js | ||
| homework.js | ||
| management.js | ||
| shixun.js | ||
| syllabus.js | ||
| user.js | ||