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:12:19 +00:00
parent 9da69c10aa
commit b62bcb49f1
1 changed files with 185 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

4
utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html
View file

@ -111,11 +111,7 @@
</tr> </tr>
<tr> <tr>
<td>pause</td> <td>pause</td>
<<<<<<< .mine
<td>50000</td> <td>50000</td>
=======
<td>10000</td>
>>>>>>> .r513
<td></td> <td></td>
</tr> </tr>
<tr> <tr>