From cb06e1cd4deab80b2c25553bb874801d10048fd8 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 14 Jun 2022 17:55:19 +0800
Subject: [PATCH] * Conflict resolution.

---
 module/execution/view/managemembers.html.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/module/execution/view/managemembers.html.php b/module/execution/view/managemembers.html.php
index 2591fc591d..f639c059ab 100644
--- a/module/execution/view/managemembers.html.php
+++ b/module/execution/view/managemembers.html.php
@@ -87,11 +87,7 @@
         <?php if(!isset($users[$deptAccount])) continue;?>
         <?php if(isset($members2Import[$deptAccount])) continue;?>
         <tr class='addedItem'>
-<<<<<<< HEAD
-          <td><?php echo html::select("accounts[]", $users, $deptAccount, "class='form-control user-picker' onchange='setRole(this.value, $i)' data-max-list-count=" . $config->maxCount);?></td>
-=======
-          <td><?php echo html::select("accounts[]", $users, $deptAccount, "class='form-control picker-select' onchange='setRole(this.value, $i)'");?></td>
->>>>>>> sprint/sunhao/task56391
+          <td><?php echo html::select("accounts[]", $users, $deptAccount, "class='form-control picker-select' onchange='setRole(this.value, $i)' data-max-list-count=" . $config->maxCount);?></td>
           <td><input type='text' name='roles[]' id='role<?php echo $i;?>' class='form-control' value='<?php echo $roles[$deptAccount]?>'/></td>
           <td><input type='text' name='days[]'  id='days<?php echo $i;?>' class='form-control' value='<?php echo $execution->days?>'/></td>
           <td>
@@ -109,11 +105,7 @@
 
         <?php for($j = 0; $j < 5; $j ++):?>
         <tr class='addedItem'>
-<<<<<<< HEAD
-          <td><?php echo html::select("accounts[]", $users, '', "class='form-control user-picker' onchange='setRole(this.value, $i)' data-max-list-count=" . $config->maxCount);?></td>
-=======
-          <td><?php echo html::select("accounts[]", $users, '', "class='form-control picker-select' onchange='setRole(this.value, $i)'");?></td>
->>>>>>> sprint/sunhao/task56391
+          <td><?php echo html::select("accounts[]", $users, '', "class='form-control picker-select' onchange='setRole(this.value, $i)' data-max-list-count=" . $config->maxCount);?></td>
           <td><input type='text' name='roles[]' id='role<?php  echo ($i);?>' class='form-control' /></td>
           <td><input type='text' name='days[]'  id='days<?php  echo ($i);?>' class='form-control' value='<?php echo $execution->days?>'/></td>
           <td>