SIGN IN SIGN UP

Fix committed merge conflict.

G
Georg Brandl committed
6e7196fb933f24abc915e9c20b9fa676a04b82c5
Parent: e7c78b2