Fix FE conflicts

1 files changed, 1 insertions, 20 deletions

diff --git a/app/assets/javascripts/members.js b/app/assets/javascripts/members.js
index bfc4e551168..8291b8c4a70 100644
--- a/app/assets/javascripts/members.js
+++ b/app/assets/javascripts/members.js
@@ -31,27 +31,8 @@
           toggleLabel(selected, $el) {
             return $el.text();
           },
-<<<<<<< HEAD
-          clicked: (selected, $link) => {
-            this.formSubmit(null, $link);
-=======
           clicked: (options) => {
-            const $link = options.$el;
-
-            if (!$link.data('revert')) {
-              this.formSubmit(null, $link);
-            } else {
-              const { $memberListItem, $toggle, $dateInput } = this.getMemberListItems($link);
-
-              $toggle.disable();
-              $dateInput.disable();
-
-              this.overrideLdap($memberListItem, $link.data('endpoint'), false).fail(() => {
-                $toggle.enable();
-                $dateInput.enable();
-              });
-            }
->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
+            this.formSubmit(null, options.$el);
           },
         });
       });