Holly fixed pause statement due to error.

2010-06-04 19:04:48 +00:00 · 2010-06-04 19:04:48 +00:00 · bac62276fd
commit bac62276fd
parent 4c627dbd4a
1 changed files with 184 additions and 189 deletions
--- a/utilities/acceptance-tests/suites/CreatePeople/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/CreateTestFacultyMember.html
@ -111,12 +111,7 @@
 </tr>
 <tr>
 	<td>pause</td>
-<<<<<<< .mine
 	<td>50000</td>
-=======
-	<td>10000</td>
->>>>>>> .r513
-	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>