Skip to content
Snippets Groups Projects
Commit a79afeb7 authored by Johannes's avatar Johannes
Browse files

got master stuff back
parent 86a6ac08
No related branches found
No related tags found
No related merge requests found
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
<<<<<<< HEAD
System.out.println("Some master developer stuff"); System.out.println("Some master developer stuff");
=======
System.out.println("Second most wanted developer stuff");
>>>>>>> dev
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment