Edit pom.xml
This commit is contained in:
parent
3ef464986c
commit
0e7fae21c3
5
pom.xml
5
pom.xml
@ -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>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user