diff --git a/.DS_Store b/.DS_Store index 567af4da45befda757c8a96d05072bd427b7416f..8b6d866f656105778a30b7450aa7f13123d1db43 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index 6b981a0587d39e66433319f2404049a275927a4c..f75707a7f0651df2a8265da15ef2dec036e8da4f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,9 @@ /CityDoctorParent/.idea/jarRepositories.xml /CityDoctorParent/.idea/misc.xml /CityDoctorParent/.idea/vcs.xml +<<<<<<< HEAD +.DS_Store +======= .idea /.metadata/ +>>>>>>> 0fda3d4dc371165f323d97dac6efb540d0836d92 diff --git a/TestBHT/.DS_Store b/TestBHT/.DS_Store index d2045271ea68a9c5ba812dd751da65a720206367..7624e59bebad562dc02e1850a6c77f3c683729a2 100644 Binary files a/TestBHT/.DS_Store and b/TestBHT/.DS_Store differ diff --git a/TestBHT/bin/.gitignore b/TestBHT/bin/.gitignore index a76286e69d8a78b7f37bfa5ce405d0245a80e93b..ddf9c65631a71e4c04076e18bfe95eb86138f2e7 100644 --- a/TestBHT/bin/.gitignore +++ b/TestBHT/bin/.gitignore @@ -1,2 +1 @@ /main/ -/.DS_Store diff --git a/TestBHT/bin/main/JavaMenu.class b/TestBHT/bin/main/JavaMenu.class index 4e837ac76a52c24c23b71e316d4719d72bf9c54f..d80a0371cdd80a93ee50dd14373495f0f1eb776c 100644 Binary files a/TestBHT/bin/main/JavaMenu.class and b/TestBHT/bin/main/JavaMenu.class differ diff --git a/TestBHT/src/.DS_Store b/TestBHT/src/.DS_Store index ac7e37b0a6e1dadfe55c60bbe9987e9e44c03164..e4e3d716aa194eaac183915148fe630a50f3dcdd 100644 Binary files a/TestBHT/src/.DS_Store and b/TestBHT/src/.DS_Store differ diff --git a/TestBHT/src/main/JavaMenu.java b/TestBHT/src/main/JavaMenu.java index 77497e98058f17daf764595e280223021d95d3e2..b598b49166efaf52269369feb45cde851fd7fd2d 100644 --- a/TestBHT/src/main/JavaMenu.java +++ b/TestBHT/src/main/JavaMenu.java @@ -17,7 +17,7 @@ public class JavaMenu System.out.println("2 fuer maennlich"); - System.out.println("3 fuer divers"); + System.out.println("3 fuer anderes"); try {