http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7167
--- Comment #49 from M. de Rooy <[email protected]> 2012-02-25 18:41:01 UTC --- Applying: New version for updatedatabase warning: C4/Auth.pm has type 100644, expected 100755 error: patch failed: C4/Auth.pm:35 error: C4/Auth.pm: patch does not apply error: patch failed: koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css:2133 error: koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css: patch does not apply error: patch failed: mainpage.pl:29 error: mainpage.pl: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merged C4/Auth.pm CONFLICT (content): Merge conflict in C4/Auth.pm Auto-merged installer/data/mysql/kohastructure.sql Auto-merged koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css Auto-merged mainpage.pl CONFLICT (content): Merge conflict in mainpage.pl Failed to merge in the changes. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
