Merge branch 'bobsexperiment'
This commit is contained in:
commit
12d20193e0
@ -2,6 +2,15 @@ package gittest;
|
|||||||
|
|
||||||
public class B {
|
public class B {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test method
|
||||||
|
* @param args
|
||||||
|
*/
|
||||||
|
public static void main(String[] args) {
|
||||||
|
System.out.println("Hello World!");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "This is a string from B (would usually do something else)";
|
return "This is a string from B (would usually do something else)";
|
||||||
|
@ -3,5 +3,6 @@ package gittest;
|
|||||||
public class Main {
|
public class Main {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
A a = new A();
|
A a = new A();
|
||||||
|
B b = new B();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user