Merge remote-tracking branch 'origin/master'
# Conflicts: # src/gittest/Main.java
This commit is contained in:
commit
5845c41582
@ -3,5 +3,7 @@ package gittest;
|
|||||||
public class Main {
|
public class Main {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
C c = new C(); // Test
|
C c = new C(); // Test
|
||||||
|
A a = new A();
|
||||||
|
B b = new B();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user