Repaired merge conflicts resuling from ttopac-move-templates
[working/Evergreen.git] / docs /
drwxr-xr-x   ..
drwxr-xr-x - 1.6
drwxr-xr-x - TechRef