add examples urlconnection property with several methods

CatarinaGamboa · CatarinaGamboa · commit d9a15b3d9346 · 2025-04-15T17:32:07.000+01:00
diff --git a/latte-umbrella/src/test/java/latte/latte_umbrella/AppTest.java b/latte-umbrella/src/test/java/latte/latte_umbrella/AppTest.java
@@ -118,6 +118,7 @@ public void testURLConnectionSetPropertyMultipleShort(){
             assert(false);
         }
     }
+<<<<<<< HEAD
 
     @Test
     public void testTimerTaskCannotReschedule(){
@@ -148,6 +149,8 @@ public void testResultSetForwardOnly(){
             assert(false);
         }
     }
+=======
+>>>>>>> 4ba1475 (add examples urlconnection property with several methods)
     
     /*
      * Incorrect Examples

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ public void testURLConnectionSetPropertyMultipleShort(){`
`118`	`118`	`assert(false);`
`119`	`119`	`}`
`120`	`120`	`}`
	`121`	`+<<<<<<< HEAD`
`121`	`122`
`122`	`123`	`@Test`
`123`	`124`	`public void testTimerTaskCannotReschedule(){`
`@@ -148,6 +149,8 @@ public void testResultSetForwardOnly(){`
`148`	`149`	`assert(false);`
`149`	`150`	`}`
`150`	`151`	`}`
	`152`	`+=======`
	`153`	`+>>>>>>> 4ba1475 (add examples urlconnection property with several methods)`
`151`	`154`
`152`	`155`	`/*`
`153`	`156`	`* Incorrect Examples`