duo-labs / cloudmapper

CloudMapper helps you analyze your Amazon Web Services (AWS) environments.
BSD 3-Clause "New" or "Revised" License
5.9k stars 800 forks source link

Kbroughton #820

Closed 0xdabbad00 closed 3 years ago

0xdabbad00 commented 3 years ago

This corrects the issues in @kbroughton's PR #735

0xdabbad00 commented 3 years ago

@steiza This can be merged

steiza commented 3 years ago

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?

0xdabbad00 commented 3 years ago

@steiza I've resolved the conflict now.

0xdabbad00 commented 3 years ago

@kbroughton it is finally merged! I apologize this has taken me months.