Resolved last merge conflict

This commit is contained in:
luca9913 2023-06-27 18:48:18 +02:00
parent 93cf39cfe9
commit aed1d3848b

View File

@ -54,12 +54,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
<version>3.11.0</version> <version>3.11.0</version>
<configuration> <configuration>
<compilerArgs>--enable-preview</compilerArgs> <compilerArgs>--enable-preview</compilerArgs>
<<<<<<< HEAD
<source>20</source> <source>20</source>
<target>20</target> <target>20</target>
=======
<release>20</release>
>>>>>>> patternMatching
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -127,11 +123,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
</repository> </repository>
</repositories> </repositories>
<properties> <properties>
<<<<<<< HEAD
<maven.compiler.source>20</maven.compiler.source>
<maven.compiler.target>20</maven.compiler.target>
=======
>>>>>>> patternMatching
<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass> <mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
</properties> </properties>
<distributionManagement> <distributionManagement>