Closed dillonhuff closed 4 years ago
@jeffsetter this another attempt at resolving merge conflicts. If this branch passes tests on travis we should merge it to master and delete the other pull request.
@jeffsetter are you ok with merging this pull request? If so I am going to merge it.
Let me review the changes first.
@jeffsetter this another attempt at resolving merge conflicts. If this branch passes tests on travis we should merge it to master and delete the other pull request.