CE upstream
Unmerged paths: (use "git add ..." to mark resolution)
both modified: app/assets/stylesheets/pages/projects.scss
both modified: app/views/shared/_clone_panel.html.haml@jschatz1 Please resolve these conflicts.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Unmerged paths: (use "git add ..." to mark resolution)
both modified: app/assets/stylesheets/pages/projects.scss
both modified: app/views/shared/_clone_panel.html.haml@jschatz1 Please resolve these conflicts.