Merge branch 'JIWOO'
Conflicts: pom.xml
This commit is contained in:
commit
6a136f62ec
3
pom.xml
3
pom.xml
@ -495,14 +495,13 @@
|
|||||||
<version>3.9</version>
|
<version>3.9</version>
|
||||||
</dependency>-->
|
</dependency>-->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<defaultGoal>install</defaultGoal>
|
<defaultGoal>install</defaultGoal>
|
||||||
<directory>${basedir}/target</directory>
|
<directory>${basedir}/target</directory>
|
||||||
<finalName>ROOT</finalName>
|
<finalName>fairnet</finalName>
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user