From a79afeb76e64041af608502f6f2a0cb33841b529 Mon Sep 17 00:00:00 2001
From: Johannes Helle-Feldmann <johannes.helle-feldmann@stud.hs-hannover.de>
Date: Tue, 18 Oct 2022 15:10:53 +0200
Subject: [PATCH] got master stuff back
---
src/Main.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/Main.java b/src/Main.java
index a3df086..1777d4e 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
}
}
--
GitLab