Fixes conflicts on app/views/projects/_flash_messages.html.haml

app/views/projects/_flash_messages.html.haml

@@ -5,11 +5,8 @@
   - if current_user && can?(current_user, :download_code, project)
     = render 'shared/no_ssh'
     = render 'shared/no_password'
-<<<<<<< HEAD
     = render 'shared/shared_runners_minutes_limit', project: project
     = render 'shared/auto_devops_implicitly_enabled_banner', project: project
+    = render 'shared/auto_devops_implicitly_enabled_banner', project: project
     - if project.above_size_limit?
       = render 'above_size_limit_warning'
-=======
-    = render 'shared/auto_devops_implicitly_enabled_banner', project: project
->>>>>>> upstream/master