[Koha-bugs] [Bug 7677] New area in subscriptions and new function when receiving
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Wed Jun 18 17:11:27 CEST 2014
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7677
Koha Team Lyon 3 <koha at univ-lyon3.fr> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |koha at univ-lyon3.fr
--- Comment #29 from Koha Team Lyon 3 <koha at univ-lyon3.fr> ---
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.
More information about the Koha-bugs
mailing list