Resolve conflict in app/assets/javascripts/gl_dropdown.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/gl_dropdown.js

@@ -630,13 +630,10 @@ GitLabDropdown = (function() {
     }
     html = document.createElement('li');
 
-<<<<<<< HEAD
     if (rowHidden) {
       html.style.display = 'none';
     }
 
-=======
->>>>>>> upstream/master
     if (data === 'divider' || data === 'separator') {
       html.className = data;
       return html;