Resolve conflicts from projects dropdown

[ci skip]

app/assets/javascripts/api.js

@@ -5,11 +5,7 @@ const Api = {
   groupPath: '/api/:version/groups/:id.json',
   namespacesPath: '/api/:version/namespaces.json',
   groupProjectsPath: '/api/:version/groups/:id/projects.json',
-<<<<<<< HEAD
-  projectsPath: '/api/:version/projects.json?simple=true',
-=======
   projectsPath: '/api/:version/projects.json',
->>>>>>> upstream/master
   projectLabelsPath: '/:namespace_path/:project_path/labels',
   groupLabelsPath: '/groups/:namespace_path/labels',
   licensePath: '/api/:version/templates/licenses/:key',

app/assets/javascripts/gl_dropdown.js

@@ -655,10 +655,7 @@ GitLabDropdown = (function() {
         fieldName = this.options.fieldName;
 
         if (value) {
-<<<<<<< HEAD
-=======
           value = value.toString().replace(/'/g, '\\\'');
->>>>>>> upstream/master
           field = this.dropdown.parent().find(`input[name='${fieldName}'][value='${value}']`);
           if (field.length) {
             selected = true;

app/assets/stylesheets/framework/dropdowns.scss

@@ -849,8 +849,6 @@
   }
 }
 
-<<<<<<< HEAD
-=======
 @media (max-width: $screen-xs-max) {
   .navbar-gitlab {
     li.header-projects,
@@ -870,7 +868,6 @@
   }
 }
 
->>>>>>> upstream/master
 @include new-style-dropdown('.breadcrumbs-list .dropdown ');
 @include new-style-dropdown('.js-namespace-select + ');