This commit is contained in:
hlm7 2010-05-21 14:32:56 +00:00
parent 8e3ebe86aa
commit d11d0f17dc

View file

@ -39,6 +39,11 @@
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>setTimeout</td>
<td>100000</td>
<td></td>
</tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>/vivo/</td> <td>/vivo/</td>
@ -106,7 +111,11 @@
</tr> </tr>
<tr> <tr>
<td>pause</td> <td>pause</td>
<<<<<<< .mine
<td>50000</td>
=======
<td>10000</td> <td>10000</td>
>>>>>>> .r513
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -139,6 +148,11 @@
<td>primaryAction</td> <td>primaryAction</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>50000</td>
<td></td>
</tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Individual Control Panel</td> <td>Individual Control Panel</td>