Edit pom.xml

This commit is contained in:
JuhoKang 2016-02-02 07:48:43 +09:00
parent 3ef464986c
commit 0e7fae21c3

View File

@ -354,10 +354,6 @@
<excludeFromFailureFile>exclude-pmd.properties</excludeFromFailureFile>
</configuration>
</execution>
<<<<<<< HEAD
</executions>
</plugin>
=======
</executions>
</plugin>
@ -382,7 +378,6 @@
</execution>
</executions>
</plugin>
>>>>>>> upstream/master
</plugins>
</build>