Closed hokiegeek2 closed 5 years ago
@hokiegeek2 the pull request has conflicts, and please fix it.
@Marcnuth I fixed the merge conflict. Please run all the unit tests and let me know if you have any questions or concerns regarding the changes I made, thanks!
I will be happy to merge the conflicts. The enhanced unit test coverage will ensure we catch any merge issues and fix 'em.
--John