Merge conflict resolved in .gitignore

.gitignore

@@ -4,4 +4,9 @@
 /CityDoctorParent/.idea/jarRepositories.xml
 /CityDoctorParent/.idea/misc.xml
 /CityDoctorParent/.idea/vcs.xml
+<<<<<<< HEAD
 .DS_Store
+=======
+.idea
+/.metadata/
+>>>>>>> 0fda3d4dc371165f323d97dac6efb540d0836d92

TestBHT/.classpath

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-22">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

TestBHT/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>TestBHT</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

TestBHT/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

TestBHT/.settings/org.eclipse.jdt.core.prefs

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=22
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=22
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=22

TestBHT/bin/.gitignore

+/main/
+/.DS_Store

TestBHT/src/main/JavaMenu.java

+package main;
+
+import java.util.Scanner;
+
+public class JavaMenu
+{
+	public static void main(String[] args)
+	{
+		System.out.println("Hallo, bitte gebe deinen Namen ein: ");
+
+		String name = System.console().readLine();
+
+		
+		System.out.println("Bitte waehle dein Geschlecht:");
+
+		System.out.println("1 fuer weiblich");
+
+		System.out.println("2 fuer maennlich");
+
+		System.out.println("3 fuer divers");
+	
+		try
+		{
+			int var = Integer.parseInt(System.console().readLine());
+
+			switch (var)
+			{
+			case 1:
+				System.out.println("Hallo Frau " + name);
+				break;
+			case 2:
+				System.out.println("Hallo Herr " + name);
+				break;
+			case 3:
+				System.out.println("Hallo " + name);
+				break;
+			default:
+				System.out.println("Keine gueltige Auswahl (1, 2, 3) getroffen. Trotzdem hallo " + name);
+				break;
+			}
+		}
+		catch(NumberFormatException e)
+		{
+			System.out.println("Das hat nicht geklappt. Es muss eine Zahl eingegeben werden. Versuche es nochmal.");
+		    e.printStackTrace();
+		}
+		
+		
+		
+	}
+}
\ No newline at end of file

TestBHT/src/module-info.java

+/**
+ * 
+ */
+/**
+ * 
+ */
+module TestBHT {
+}
\ No newline at end of file