* 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 bbeb322d41
commit aa96649458
3 changed files with 35 additions and 2 deletions
@@ -30,5 +30,4 @@
<!-- testing -->
<assertj-core.version>3.10.0</assertj-core.version>
</properties>
</project>
</project>