Bug 12478: fix some issues on rebase
authorRobin Sheat <robin@catalyst.net.nz>
Wed, 30 Sep 2015 02:46:18 +0000 (15:46 +1300)
committerBrendan Gallagher <brendan@bywatersolutions.com>
Tue, 26 Apr 2016 20:20:09 +0000 (20:20 +0000)
commit0b9483a691af2dc6322f240daee5b754ba214e82
treed6a000cf6df1aecfc9a9f6c30843a244992c7cb6
parent2aa72529c0b411bf1b8367293ac885f836759a49
Bug 12478: fix some issues on rebase

There were rebase conflicts that it was just easier to postpone until
afterwards.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Koha/Biblio/Iterator.pm [deleted file]
Koha/BiblioUtils.pm
Koha/BiblioUtils/Iterator.pm [new file with mode: 0644]
installer/data/mysql/updatedatabase.pl
misc/search_tools/rebuild_elastic_search.pl
t/db_dependent/Koha/Biblio.t [deleted file]
t/db_dependent/Koha/BiblioUtils.t [new file with mode: 0755]