SIGN IN SIGN UP

fix merge error to use new default settings flow

K
K Simmons committed
e7b1060bca7c7478f27061ee0a65e16cfb923bca
Parent: 7f3018c