Skip to content

Commit 8959494

Browse files
add example for timertask
1 parent d9a15b3 commit 8959494

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

  • latte-umbrella/src/test/java/latte/latte_umbrella

latte-umbrella/src/test/java/latte/latte_umbrella/AppTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ public void testURLConnectionSetPropertyMultipleShort(){
118118
assert(false);
119119
}
120120
}
121-
<<<<<<< HEAD
122121

123122
@Test
124123
public void testTimerTaskCannotReschedule(){
@@ -149,9 +148,7 @@ public void testResultSetForwardOnly(){
149148
assert(false);
150149
}
151150
}
152-
=======
153-
>>>>>>> 4ba1475 (add examples urlconnection property with several methods)
154-
151+
155152
/*
156153
* Incorrect Examples
157154
*/

0 commit comments

Comments
 (0)