Repaired merge conflicts resuling from ttopac-move-templates
[working/Evergreen.git] / Open-ILS / src / templates / default /
drwxr-xr-x   ..
drwxr-xr-x - acq
drwxr-xr-x - actor
-rw-r--r-- 1320 base.tt2
drwxr-xr-x - booking
drwxr-xr-x - cat
drwxr-xr-x - circ
drwxr-xr-x - conify
-rw-r--r-- 72 footer.tt2
-rw-r--r-- 353 header.tt2
-rw-r--r-- 8542 menu.tt2
drwxr-xr-x - opac
drwxr-xr-x - serial
drwxr-xr-x - vandelay