Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kbroughton #820

Merged
merged 6 commits into from
Dec 7, 2020
Merged

Kbroughton #820

merged 6 commits into from
Dec 7, 2020

Conversation

0xdabbad00
Copy link
Collaborator

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

@0xdabbad00
Copy link
Collaborator Author

@steiza This can be merged

@steiza
Copy link

steiza commented Dec 7, 2020

Oops! I think I created a merge conflict with this branch by landing ccd971c. @0xdabbad00 do you want to resolve the merge conflict, or should I?

@0xdabbad00
Copy link
Collaborator Author

@steiza I've resolved the conflict now.

@steiza steiza merged commit 4f5ec6f into duo-labs:main Dec 7, 2020
@0xdabbad00
Copy link
Collaborator Author

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

kbroughton added a commit to kbroughton/cloudmapper that referenced this pull request Feb 3, 2021
* add 50+ vendors to endor_accounts.yaml

* remove non-public accountids

* change altus source

* Removed sources for unconfirmed accounts and a few other corrections that were mentioned in the duo-labs#735 PR

Co-authored-by: Kesten Broughton <[email protected]>
Co-authored-by: kesten broughton <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants