]> git.koha-community.org Git - koha.git/commit
projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c63d560) | patch
Bug 12768: Fix bad merge resolution conflict
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 23 Oct 2017 19:59:11 +0000 (16:59 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 23 Oct 2017 19:59:13 +0000 (16:59 -0300)
commit42c634745cac4fc33a53bc1312a3e143a2e0ffbc
treef480dfd8d90e1e4280ba856949e3109de7bc3de6tree | snapshot
parentc63d560b041ab67bafc65a6f9e65eee9e43c2a1acommit | diff
Bug 12768: Fix bad merge resolution conflict

RM note:
I have applied
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=68427
on top of other patches that were already pushed.
But it was supposed to replace them, this change revert what was in
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=68417

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
C4/Accounts.pm diff | blob | history
Main Koha release repository