Login Issue

[CC Hair]

Hi,

Whenever a customer wishes to login into their account a message comes up saying "There was a security error when trying to login."

Anyone know why I'm getting this error?

[CC Hair]

Hi I found the solution

Remedy:
If you have customized template "login" files, the new security features need to be merged into your customized template files.

The following files are affected:
- /includes/templates/YOUR_TEMPLATE/templates/tpl_login_default.php
- /includes/templates/YOUR_TEMPLATE/templates/tpl_timeout_default.php

But how do I merge them? From what to what?