Closed 0xdabbad00 closed 3 years ago
@steiza This can be merged
Oops! I think I created a merge conflict with this branch by landing https://github.com/duo-labs/cloudmapper/commit/ccd971c84c4cb0c6491ef6fe0faca097f68eb6ea. @0xdabbad00 do you want to resolve the merge conflict, or should I?
@steiza I've resolved the conflict now.
@kbroughton it is finally merged! I apologize this has taken me months.
This corrects the issues in @kbroughton's PR #735