CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/sysprefs.sql Auto-merging catalogue/detail.pl Failed to merge in the changes. Patch failed at 0001 Bug 5010 - Fix OPACBaseURL to include protocol On Sat, Apr 18, 2015 at 3:28 PM, Mark Tompsett <mtompset@hotmail.com> wrote:

Greetings,

I know it is big and scary, but could someone attempt to sign off bug 5010? Thank you. [image: Smile]

GPML, Mark Tompsett

_______________________________________________ Koha-devel mailing list Koha-devel@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/

-- --------------------------------------------------------------------------------------------------------------- Brendan A. Gallagher ByWater Solutions CEO Support and Consulting for Open Source Software Installation, Data Migration, Training, Customization, Hosting and Complete Support Packages Headquarters: Santa Barbara, CA - Office: Redding, CT Phone # (888) 900-8944 http://bywatersolutions.com info@bywatersolutions.com