CE upstream
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/views/layouts/header/_default.html.haml
both modified: app/views/layouts/nav/_project_settings.html.hamlDo not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/views/layouts/header/_default.html.haml
both modified: app/views/layouts/nav/_project_settings.html.haml