


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

=======
>>>>>>> branch 'master' of https://github.com/Propra16/programmierpraktikum-abschlussprojekt-pwnyhof
		assertEquals(9, Code.add());
	}
}

@@ -208,130 +208,8 @@
 ()%7B%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A%0A=======%0A%3E%3E%3E%3E%3E%3E%3E branch 'master' of https://github.com/Propra16/programmierpraktikum-abschlussprojekt-pwnyhof
 %0A%09%09a

Update Try.java