Merge fixes after ce-upstream update

1d1795fe · Alejandro Rodríguez · 4f0a19f4 · 1d1795fe · 1d1795fe
Commit 1d1795fe authored Nov 14, 2016 by Alejandro Rodríguez
2 changed files
--- a/app/views/layouts/nav/_group_settings.html.haml
+++ b/app/views/layouts/nav/_group_settings.html.haml
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -133,7 +133,6 @@ describe Projects::MergeRequestsController do
          id: merge_request.iid,
          format: 'html'
      expect(assigns(:labels)).not_to be_nil
->>>>>>> ce/master
    end
  end