Fix bad conflict resolution from rebase
This commit is contained in:
parent
cdb02004fd
commit
4fb0ac8082
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<powermock.version>2.0.7</powermock.version>
|
<powermock.version>2.0.7</powermock.version>
|
||||||
<wdtk.version>0.11.1</wdtk.version>
|
<wdtk.version>0.12.0-SNAPSHOT</wdtk.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
Loading…
Reference in New Issue
Block a user