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

---
 .../CreatePeople/CreateTestFacultyMember.html      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CreatePeople/CreateTestFacultyMember.html
index 500c9543..3dc402c2 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/CreateTestFacultyMember.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>
@@ -106,7 +111,11 @@
 </tr>
 <tr>
 	<td>pause</td>
+<<<<<<< .mine
+	<td>50000</td>
+=======
 	<td>10000</td>
+>>>>>>> .r513
 	<td></td>
 </tr>
 <tr>
@@ -139,6 +148,11 @@
 	<td>primaryAction</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>50000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Individual Control Panel</td>