http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7677
Koha Team Lyon 3 <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #29 from Koha Team Lyon 3 <[email protected]> --- h1>Something went wrong !</h1>Applying: Bug 7677: UT: add unit tests for GetPreviousSerialid Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Serials_2.t Applying: BZ7677: New areas in subscriptions and new functions when receiving. Using index info to reconstruct a base tree... <stdin>:49: trailing whitespace. ORDER BY serialid DESC LIMIT ,1 <stdin>:97: trailing whitespace. , , , , , <stdin>:198: trailing whitespace. choices: warning: 3 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging C4/Serials.pm Auto-merging installer/data/mysql/kohastructure.sql 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/serials/serials-edit.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt Auto-merging serials/subscription-add.pl Failed to merge in the changes. Patch failed at 0001 BZ7677: New areas in subscriptions and new functions when receiving. -- 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/
