Merge branch 'JIWOO'

Conflicts:
	pom.xml
This commit is contained in:
JIWOO 2024-09-26 11:56:15 +09:00
commit 6a136f62ec

View File

@ -496,13 +496,12 @@
</dependency>-->
</dependencies>
<build>
<defaultGoal>install</defaultGoal>
<directory>${basedir}/target</directory>
<finalName>ROOT</finalName>
<finalName>fairnet</finalName>
<pluginManagement>
<plugins>
<plugin>