Conflicts: app/views/layouts/_course_base_info.html.erb |
||
|---|---|---|
| .. | ||
| _article.html.erb | ||
| _article_list.html.erb | ||
| _homepage.html.erb | ||
| index.html.erb | ||
| index.js.erb | ||
| show.html.erb | ||
Conflicts: app/views/layouts/_course_base_info.html.erb |
||
|---|---|---|
| .. | ||
| _article.html.erb | ||
| _article_list.html.erb | ||
| _homepage.html.erb | ||
| index.html.erb | ||
| index.js.erb | ||
| show.html.erb | ||