http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10449 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |katrin.fischer@bsz-bw.de --- Comment #3 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I am sorry, but this does no longer apply due to a conflict in the VirtualShelves.t: Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 10499: VirtualShelves.t - wrap tests in a database connection Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/VirtualShelves.t CONFLICT (content): Merge conflict in t/db_dependent/VirtualShelves.t Failed to merge in the changes. Patch failed at 0001 Bug 10499: VirtualShelves.t - wrap tests in a database connection 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". -- You are receiving this mail because: You are watching all bug changes.