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.
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.