See comments 86 and 88. This patch fixes a bad conflict resolution in a previous patch. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Galen Charlton <gmc@esilibrary.com> |
||
|---|---|---|
| .. | ||
| data/mysql | ||
| InstallAuth.pm | ||
| externalmodules.pl | ||
| html-template-to-template-toolkit.pl | ||
| install.pl | ||