[Koha-bugs] [Bug 6751] Link in readingrec.pl to export a barcode file

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6751

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |katrin.fischer at bsz-bw.de
       Patch Status|Needs Signoff               |Does not apply

--- Comment #4 from Katrin Fischer <katrin.fischer at bsz-bw.de> 2011-12-21 07:17:12 UTC ---
Does not apply to current master (using git am -i3u)

Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 6751: Adds a link "Export checkin barcodes" in readingrec
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
Auto-merging members/readingrec.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 6751: Adds a link "Export checkin barcodes" in
readingrec
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.