Fix bad merge in license comment

This commit is contained in:
Micah Lee 2018-09-15 19:05:40 -07:00
parent 8312058fcc
commit 52981b6f98
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73

View File

@ -3,7 +3,7 @@
"""
OnionShare | https://onionshare.org/
Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>>>>>>>> develop
Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by