Comment 14 for bug 1013786

Revision history for this message
Blake GH (bmagic) wrote :

I am getting a merge conflict OpenILS/WWW/EGCatLoader.pm when merging against master today. I took a look at the details and decided I shouldn't attempt to resolve it. I won't be able to get this setup for bug squashing day.