SIGN IN SIGN UP

Fixed merge error.

S
Serhiy Storchaka committed
6e87576571b5d2decc7d3e554d1c3ce31e455145
Parent: 66d1865