Fix conflitcs for app/assets/javascripts/members.js

app/assets/javascripts/members.js

@@ -7,12 +7,9 @@ export default class Members {
   }
 
   addListeners() {
-<<<<<<< HEAD
     $('.js-ldap-permissions').off('click').on('click', this.showLDAPPermissionsWarning.bind(this));
     $('.js-ldap-override').off('click').on('click', this.toggleMemberAccessToggle.bind(this));
     $('.project_member, .group_member').off('ajax:success').on('ajax:success', this.removeRow);
-=======
->>>>>>> upstream/master
     $('.js-member-update-control').off('change').on('change', this.formSubmit.bind(this));
     $('.js-edit-member-form').off('ajax:success').on('ajax:success', this.formSuccess.bind(this));
     gl.utils.disableButtonIfEmptyField('#user_ids', 'input[name=commit]', 'change');