http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5981
M. de Rooy <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Signed Off |Does not apply --- Comment #21 from M. de Rooy <[email protected]> 2011-11-14 11:33:08 UTC --- This patch is already SIGNED, but unfortunately does not apply. Please rebase. Applying: Bug 5981 : (MT 4231) Adds limits to search history /usr/share/koha/testclone/.git/rebase-apply/patch:101: trailing whitespace. ADD `limit_cgi` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `limit_desc` warning: C4/Auth.pm has type 100755, expected 100644 error: patch failed: C4/Auth.pm:130 error: C4/Auth.pm: patch does not apply error: patch failed: installer/data/mysql/updatedatabase.pl:4446 error: installer/data/mysql/updatedatabase.pl: patch does not apply Using index info to reconstruct a base tree... <stdin>:101: trailing whitespace. ADD `limit_cgi` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `limit_desc` warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merged C4/Auth.pm CONFLICT (content): Merge conflict in C4/Auth.pm Auto-merged C4/Search.pm Auto-merged installer/data/mysql/kohastructure.sql Auto-merged installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merged koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt Auto-merged opac/opac-search.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 the QA Contact for the bug. 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/
