Bug 15184: Fix bad merge conflict with created_by
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Thu, 8 Nov 2018 14:03:15 +0000 (11:03 -0300)
committerNick Clemens <nick@bywatersolutions.com>
Thu, 8 Nov 2018 15:53:00 +0000 (15:53 +0000)
commit41ebda2d95f6d01c068a7f4ab82c160105050678
treee4b7c97c0d41aa04403a92b385cd91e1f6705f60
parentb844c3c46fac6d35f6bfb08fb18294912ef0dcbb
Bug 15184: Fix bad merge conflict with created_by

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
acqui/histsearch.pl