Commit 13b7a41f authored by Stefan's avatar Stefan

Merge remote-tracking branch 'origin/master' into try

Conflicts:
	DesignV2/src/DesignV2/Hello.java
parents 54d1d5e7 41985ab9
......@@ -4,7 +4,11 @@ public class Hello {
* @param args command-line arguments; currently unused
*/
public void dog () {}
public void zebra () {}
public void lion() {}
public static void main ( String [] args ) {
System . out . println (" Hello , world !" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment