


import org.junit.Test;
import static org.junit.Assert.assertEquals;

public class Try{
	
	@Test
	public void stringTest(){
		assertEquals("Hello World!", Code.greet());
		
	}
	
	@Test
	public void addTest(){
<<<<<<< HEAD
		assertEquals(9, Code.add());
=======
		assertEquals(15, Code.add());
>>>>>>> branch 'master' of https://github.com/Propra16/programmierpraktikum-abschlussprojekt-pwnyhof
	}
}
@@ -208,21 +208,8 @@
 ()%7B%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
 %09%09as
@@ -239,149 +239,9 @@
 ));%0A
-=======%0A%09%09assertEquals(15, Code.add());%0A%3E%3E%3E%3E%3E%3E%3E branch 'master' of https://github.com/Propra16/programmierpraktikum-abschlussprojekt-pwnyhof%0A%09
+%09%7D%0A
 %7D%0A
-%7D

Update Try.java