forked from JavaTX/JavaCompilerCore
Resolved last merge conflict
This commit is contained in:
parent
93cf39cfe9
commit
aed1d3848b
9
pom.xml
9
pom.xml
@ -54,12 +54,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<version>3.11.0</version>
|
||||
<configuration>
|
||||
<compilerArgs>--enable-preview</compilerArgs>
|
||||
<<<<<<< HEAD
|
||||
<source>20</source>
|
||||
<target>20</target>
|
||||
=======
|
||||
<release>20</release>
|
||||
>>>>>>> patternMatching
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
@ -127,11 +123,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
</repository>
|
||||
</repositories>
|
||||
<properties>
|
||||
<<<<<<< HEAD
|
||||
<maven.compiler.source>20</maven.compiler.source>
|
||||
<maven.compiler.target>20</maven.compiler.target>
|
||||
=======
|
||||
>>>>>>> patternMatching
|
||||
<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
|
||||
</properties>
|
||||
<distributionManagement>
|
||||
|
Loading…
Reference in New Issue
Block a user