http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14168
Aleisha Amohia <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #10 from Aleisha Amohia <[email protected]> --- Applying: Bug 14168 - enhance streaming cataloging to include youtube /home/vagrant/kohaclone/.git/rebase-apply/patch:47: trailing whitespace. $HTML5Media_field->subfield('u'), { warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... <stdin>:47: trailing whitespace. $HTML5Media_field->subfield('u'), { warning: 1 line applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/sysprefs.sql Auto-merging C4/Installer/PerlDependencies.pm CONFLICT (content): Merge conflict in C4/Installer/PerlDependencies.pm Auto-merging C4/HTML5Media.pm CONFLICT (content): Merge conflict in C4/HTML5Media.pm Failed to merge in the changes. -- 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/
