http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7083
M. de Rooy <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Signed Off |Does not apply --- Comment #3 from M. de Rooy <[email protected]> 2011-12-07 13:54:37 UTC --- Applying: Fix for Bug 7083 - [SIGNED-OFF] Show creator name on list of public lists error: koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt: does not match index Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... error: Entry 'koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt' not uptodate. Cannot merge. fatal: merging of trees bf768d4642523bde5041af12d0403bec35148bb2 and 07a8614703fa983c030071c562ba07d3467f8448 failed Failed to merge in the changes. Please send a rebased patch. Will continue QA after it has arrived. -- 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/
