Skip to content

Commit 2dafb5d

Browse files
committed
Fix improper merge
1 parent 5c5d57c commit 2dafb5d

3 files changed

Lines changed: 1 addition & 39 deletions

File tree

README.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Prerequisites
5555
* `cryptography 1.3 <https://pypi.python.org/pypi/cryptography>`_ or higher
5656
* `qrcode 5.3 <https://pypi.python.org/pypi/qrcode>`_ or higher
5757
* `Pillow 3.4 <https://pypi.python.org/pypi/Pillow>`_ or higher
58-
* qrtools
5958

6059
wxPython isn't automatically pulled in by ``pip`` because the version at PyPI is
6160
still 2.9. Your distribution probably includes a pre-packaged version, or you can

pyauth/QrCodeUri.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
'pyotp>=2.0.1',
8282
'cryptography>=1.3',
8383
'qrcode>=5.3',
84-
'Pillow>=3.4',
85-
'qrtools'
84+
'Pillow>=3.4'
8685
],
8786

8887
package_data = {

0 commit comments

Comments
 (0)