litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Holly fixed editing conflict error.

Browse source
This commit is contained in:
hlm7 2010-06-04 19:08:51 +00:00
parent 5791cab2a4
commit 9da69c10aa
1 changed files with 220 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

3
utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html
View file

@ -190,7 +190,6 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<<<<<<< .mine
<td>refreshAndWait</td> <td>refreshAndWait</td>
<td>10000</td> <td>10000</td>
<td></td> <td></td>
@ -201,8 +200,6 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
=======
>>>>>>> .r513
<td>comment</td> <td>comment</td>
<td class="comment">Logout</td> <td class="comment">Logout</td>
<td></td> <td></td>