Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml
Dieser Commit ist enthalten in:
Silent 2021-12-30 12:59:45 +01:00
Commit 83021c46dc

Datei anzeigen

@ -99,7 +99,7 @@
<configuration> <configuration>
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>tsp.headdb.legacy.HeadDB</mainClass> <mainClass>tsp.headdb.legacy.HeadDBLegacy</mainClass>
</transformer> </transformer>
</transformers> </transformers>
</configuration> </configuration>