[biblibre-newacq] fix some merge errors
[koha_fer] / tmp /
drwxr-xr-x   ..
drwxr-xr-x - modified_authorities