Holly fixed editing conflict error.

2010-06-04 19:07:45 +00:00 · 2010-06-04 19:07:45 +00:00 · 5791cab2a4
commit 5791cab2a4
parent 095360adc1
1 changed files with 185 additions and 189 deletions
--- a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html
@ -111,11 +111,7 @@
 </tr>
 <tr>
 	<td>pause</td>
-<<<<<<< .mine
 	<td>50000</td>
-=======
-	<td>10000</td>
->>>>>>> .r513
 	<td></td>
 </tr>
 <tr>