Closed cmlh closed 9 years ago
@SudhanshuC,
I am able to merge APIv2
into master
without a [merge] conflict i.e:
cmlh$ git checkout master
Switched to branch 'master'
cmlh$ git merge APIv2
git merge APIv2
Merge made by the 'recursive' strategy.
emailpwnedatdomain => haveibeenpwned/machine_emailpwnedatdomain | 0
emailtoHIBP.py => haveibeenpwned/transforms/emailtobreachedaccountv1.py | 0
haveibeenpwned/transforms/emailtobreachedaccountv2.py | 55 ++++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+)
rename emailpwnedatdomain => haveibeenpwned/machine_emailpwnedatdomain (100%)
rename emailtoHIBP.py => haveibeenpwned/transforms/emailtobreachedaccountv1.py (100%)
create mode 100644 haveibeenpwned/transforms/emailtobreachedaccountv2.py
I don't have write access to https://github.com/SudhanshuC/Maltego-Transforms in which to resolve the merge conflict.
I'll close this pull request and create another rather than rebase.
Further Information on Endpoint
I have set the User-Agent to
Maltego-haveibeenpwned