diff --git a/src/Main.java b/src/Main.java index a3df08668d7999089d07b4993ac9aff70e8f1ce2..1777d4e300456324510a9f47e51bee07ddc34a67 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,9 +1,6 @@ public class Main { public static void main(String[] args) { -<<<<<<< HEAD + System.out.println("Some master developer stuff"); -======= - System.out.println("Second most wanted developer stuff"); ->>>>>>> dev } }