Owen Leonard f4b7e470e7 Bug 15766: (follow-up) Correct merge errors ... This patch corrects some problems applying this on current master and removes an old merge conflict marker. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>		2018-10-24 13:52:42 +00:00
..
js	Bug 19390: Make jQuery selector more specific, so OPAC view link can open in new tab	2018-08-14 11:39:05 +00:00
lib	Bug 20260: Use CodeMirror for the SQL reports editor	2018-10-12 15:50:39 -03:00
prog	Bug 15766: (follow-up) Correct merge errors	2018-10-24 13:52:42 +00:00