Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 2a93f0b

Browse files
committed
resolve confliction
2 parents a8d062b + ef6817c commit 2a93f0b

File tree

3 files changed

+718
-705
lines changed

3 files changed

+718
-705
lines changed

src/web/WEB-INF/includes/contest/editTab.jsp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@
120120
<td class="first_tab_type"><strong>Copilot</strong></td>
121121
<td class="sec_tab_type"><strong>: <span id="rCopilots"></span></strong></td>
122122
</tr>
123-
<tr class="privateProjectRow hide">
123+
<tr>
124124
<td class="first_tab_type"><strong>Private Challenge</strong></td>
125125
<td class="sec_tab_type"><strong>: <span id="rPrivateProject"></span></strong></td>
126126
</tr>
127127
<tr class="preRegisterUsersDiv hide">
128-
<td class="first_tab_type"><strong>Pre-Register Members</strong></td>
128+
<td class="first_tab_type"><strong>Assign Member(s):</strong></td>
129129
<td class="sec_tab_type"><strong>: <span id="rPreRegisterUsers"></span></strong></td>
130130
</tr>
131131
<tr>
@@ -276,13 +276,13 @@
276276
<div class="clearFix"></div>
277277
</div>
278278
<br /><br />
279-
<div id="privateProjectEditDiv" class="hide">
279+
<div id="privateProjectEditDiv">
280280
<span class="name fixWidthName"><strong>Private Challenge</strong></span>
281281
<input type="checkbox" name="privateProject" id="privateProject"/>
282282
</div>
283283
<br />
284-
<div id="preRegisterUsersEditDiv" class="hide">
285-
<span class="name fixWidthName"><strong>Pre-Register Members</strong></span>
284+
<div id="preRegisterUsersEditDiv">
285+
<span class="name fixWidthName"><strong>Assign Member(s):</strong></span>
286286
<span class="value"><input type="text" name="preRegisterUsers" class="bigin" id="preRegisterUsers"/></span>
287287
</div>
288288
<br /><br />

0 commit comments

Comments
 (0)