Holly fixed editing conflict error.

2010-06-04 19:06:42 +00:00 · 2010-06-04 19:06:42 +00:00 · 095360adc1
commit 095360adc1
parent bac62276fd
1 changed files with 221 additions and 223 deletions
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestFacultyMember.html
@ -201,8 +201,6 @@
 	<td></td>
 </tr>
 <tr>
-=======
->>>>>>> .r513
 	<td>comment</td>
 	<td class="comment">Logout</td>
 	<td></td>