Repaired merge conflicts resuling from ttopac-move-templates
[working/Evergreen.git] / Open-ILS / src / templates /
drwxr-xr-x   ..
-rw-r--r-- 1512 base.tt2
drwxr-xr-x - default
-rw-r--r-- 1062 login.tt2
drwxr-xr-x - marc
drwxr-xr-x - password-reset
drwxr-xr-x - strings