http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6828
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Needs Signoff |Does not apply --- Comment #11 from Katrin Fischer <[email protected]> 2011-12-21 06:44:31 UTC --- Hi Barry, I am sorry, your patch does not apply on master. Could you please fix and resubmit? Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 6828[ENH] - Add basic Dashboard for staff users. /home/katrin/kohaclone/.git/rebase-apply/patch:61: trailing whitespace. BEGIN { /home/katrin/kohaclone/.git/rebase-apply/patch:62: trailing whitespace. $VERSION = 3.01; /home/katrin/kohaclone/.git/rebase-apply/patch:64: trailing whitespace. @EXPORT = qw(&number_of_items_library_xml &number_of_borrowers_library_xml &number_of_issues_library_xml &number_of_biblios_xml &number_of_loan_history_system_xml /home/katrin/kohaclone/.git/rebase-apply/patch:85: trailing whitespace. /home/katrin/kohaclone/.git/rebase-apply/patch:93: trailing whitespace. warning: squelched 50 whitespace errors warning: 55 lines add whitespace errors. Using index info to reconstruct a base tree... <stdin>:61: trailing whitespace. BEGIN { <stdin>:62: trailing whitespace. $VERSION = 3.01; <stdin>:64: trailing whitespace. @EXPORT = qw(&number_of_items_library_xml &number_of_borrowers_library_xml &number_of_issues_library_xml &number_of_biblios_xml &number_of_loan_history_system_xml <stdin>:85: trailing whitespace. <stdin>:93: trailing whitespace. warning: squelched 51 whitespace errors warning: 55 lines applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt Auto-merging mainpage.pl CONFLICT (content): Merge conflict in mainpage.pl Failed to merge in the changes. Patch failed at 0001 Bug 6828[ENH] - Add basic Dashboard for staff users. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -- 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/
