Commit 6fcd2a86b676de3a528a7618087a46cff369de16
1 parent
9fa02e2e
Merge branch 'minhang' into pudong
# Conflicts: # src/main/resources/static/index.html
Showing
1 changed file
with
1 additions
and
1 deletions
src/main/resources/static/index.html
| @@ -206,7 +206,7 @@ | @@ -206,7 +206,7 @@ | ||
| 206 | <!-- LOGO --> | 206 | <!-- LOGO --> |
| 207 | <div class="page-logo"> | 207 | <div class="page-logo"> |
| 208 | <a href="index.html" class="logo-default logo-default-text"> | 208 | <a href="index.html" class="logo-default logo-default-text"> |
| 209 | - 闵行公交调度系统 </a> | 209 | + 浦东公交调度系统 </a> |
| 210 | <div class="menu-toggler sidebar-toggler"></div> | 210 | <div class="menu-toggler sidebar-toggler"></div> |
| 211 | </div> | 211 | </div> |
| 212 | <!-- END LOGO --> | 212 | <!-- END LOGO --> |