From 952e88aec44d8c5d494ea4433819922603ce48bc Mon Sep 17 00:00:00 2001 From: Komlovski Date: Fri, 5 Jul 2019 19:39:09 +0200 Subject: [PATCH 1/5] geburtstag sauber --- src/D_Test.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/D_Test.java b/src/D_Test.java index 09c0bcb..103e9fb 100644 --- a/src/D_Test.java +++ b/src/D_Test.java @@ -6,7 +6,9 @@ public class D_Test { public class NewStudent { - public static void main(String[] args) { + public static void + + (String[] args) { NewStudent st = new NewStudent(); } From 2f34e1b8b49749f54dc737b78ada6f5610e3c828 Mon Sep 17 00:00:00 2001 From: Komlovski Date: Fri, 5 Jul 2019 19:41:34 +0200 Subject: [PATCH 2/5] Merge branch 'master' of C:\Users\Komlovski\Desktop\Alpha with conflicts. --- .idea/workspace.xml | 136 +++++++++--------- .../Alpha/Main$ActionListener1.class | Bin 779 -> 645 bytes src/D_Test1.java | 53 ------- 3 files changed, 69 insertions(+), 120 deletions(-) delete mode 100644 src/D_Test1.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f276c2f..bf9bf94 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,7 @@ - + - - - + + + - - + + - - - + + + + + + + + + @@ -46,11 +52,11 @@ @@ -60,14 +66,12 @@ - - - + @@ -85,7 +89,6 @@ - @@ -108,16 +111,9 @@ - - - - -