https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12365 Lee Jamison <ldjamison@marywood.edu> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ldjamison@marywood.edu --- Comment #6 from Lee Jamison <ldjamison@marywood.edu> --- Unfortunately, still having merge conflicts with the exact conflict message Katrin indicated previously. Note: I ran reset_all in kohadevbox to guarantee a clean devbox to apply it to. -- You are receiving this mail because: You are watching all bug changes.