pfn / passifox

Extensions to allow Chrome and Firefox (4.0+) to auto form-fill passwords from KeePass (requires KeePassHttp)
GNU General Public License v3.0
908 stars 186 forks source link

Some minor edits #594

Closed zeromido closed 7 years ago

pfn commented 7 years ago

Looks good except for the conflict, can you rebase please?

Thanks!

zeromido commented 7 years ago

@pfn Why? Doesn't ebaf23d solve the conflict? Edit: If it doesn't, just copy this and paste it to this and mark as resolved; It's not that hard.

zeromido commented 7 years ago

Conflict resolved.

pfn commented 7 years ago

Thank you.