Bug 14637: Followup - Fix number of tests due to rebase
authorKyle M Hall <kyle@bywatersolutions.com>
Fri, 23 Dec 2016 13:35:34 +0000 (13:35 +0000)
committerMason James <mtj@kohaaloha.com>
Tue, 24 Jan 2017 23:45:32 +0000 (12:45 +1300)
commit783d5ea02e677fe00e8b3f7ad43d801a9a87de38
tree7e9ab83b9ee73cea8a240eb0825c8efc74be74d9
parent047c31b4246bb5eb0f20238355190f9535dc4721
Bug 14637: Followup - Fix number of tests due to rebase

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0747a11b2648a20fcca9d3f5e02a4b3b9270b3f3)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Conflicts:
t/db_dependent/Koha/Patron/Categories.t
t/db_dependent/Koha/Patron/Categories.t