Remove leftover merge conflict on the FAQ page#3783

Merged

code-asher merged 3 commits intocoder:mainfrom

notpushkin:patch-1

Jul 19, 2021

Commits on Jul 15, 2021

Remove leftover merge conflict
notpushkin
authored

Commits on Jul 17, 2021

Bring back the “security login validation” section, update ToC
notpushkin
authored

Commits on Jul 19, 2021

Tweak login limit verbiage

code-asher
and
jawnsy
authored