* BAEL-4401

* Update with master and resolve conflicts
This commit is contained in:
Amy DeGregorio
2020-08-24 11:20:26 -04:00
committed by GitHub
parent 26799b86a7
commit dd9e79a64e
3 changed files with 35 additions and 2 deletions

View File

@@ -30,5 +30,4 @@
<!-- testing -->
<assertj-core.version>3.10.0</assertj-core.version>
</properties>
</project>
</project>