Belated thanks, Herve, for getting this fixed for the release.
I think the same problem has popped up again, as seen in these latest trena
build report:
o ERROR for 'R CMD check' on malbec2. See the details here:
https://master.bioconductor.org/checkResults/3.9/bioc-LATEST/trena/malbec2-c
Dear Maintainers,
A new "pre-receive hook" on git.bioconductor.org server has been enabled to
keep the repositories in good shape. The new hook prevents "merge conflict
markers". Please note that the hook is now enabled as of 11:45 AM May 10th
2019.
Git merges sometimes result in conflicts wi
