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
..
data
includes	Bug 21216: (follow-up) Exclude some columns from export	2018-10-24 13:38:49 +00:00
modules	Bug 15766: (follow-up) Correct merge errors	2018-10-24 13:52:42 +00:00
xslt	Bug 20910: Tidy 773 handling XSLT code	2018-10-09 11:07:47 +00:00
columns.def