From 1db0a2eda23c6aaa0b628eeba8639972dd01e1fa Mon Sep 17 00:00:00 2001
From: hlm7 <hlm7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 21 May 2010 14:33:12 +0000
Subject: [PATCH]

---
 .../CreatePeople/DeleteTestFacultyMember.html  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestFacultyMember.html
index ca536194..42706f69 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestFacultyMember.html
@@ -39,6 +39,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/</td>
@@ -185,6 +190,19 @@
 	<td></td>
 </tr>
 <tr>
+<<<<<<< .mine
+	<td>refreshAndWait</td>
+	<td>10000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextNotPresent</td>
+	<td>Faculty Member</td>
+	<td></td>
+</tr>
+<tr>
+=======
+>>>>>>> .r513
 	<td>comment</td>
 	<td class="comment">Logout</td>
 	<td></td>