https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26327 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #24 from Tomás Cohen Arazi <tomascohen@gmail.com> --- (In reply to Jonathan Druart from comment #23)
Can you rebase please?
Applying: Bug 26327: (follow-up) Add transacting library to the transactions tab error: sha1 information is lacking or useless (admin/columns_settings.yml).
What git version are you using? Mine gave me a really trivial merge conflict: $ git --version git version 2.28.0 $ git diff diff --cc admin/columns_settings.yml index 9400dcf3691,3f1d19ee79d..00000000000 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@@ -666,7 -666,7 +666,11 @@@ modules - columnname: issuedate - ++<<<<<<< HEAD + columnname: home_library ++======= + columnname: checked_out_from ++>>>>>>> Bug 26327: (follow-up) Add transacting library to the transactions tab - columnname: note - -- You are receiving this mail because: You are watching all bug changes.