simono41/pyicloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #81 from Longhanks/master

Browse source 
Remove stray git merge conflict marker
This commit is contained in:
Tor Arne Vestbø 2016-04-11 18:41:28 +02:00
commit 14518d4bc8
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.rst
View file

@ -64,7 +64,6 @@ If you have enabled two-factor authentication for the account you will have to d
sys.exit(1)
Note: Both regular login and two-factor authentication will expire after an interval set by Apple, at which point you will have to re-authenticate. This interval is currently two months.
>>>>>>> Add support for two-factor authentication
=======
Devices