[Koha-bugs] [Bug 18448] Fix a few db_dependent tests

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18448

--- Comment #8 from Marcel de Rooy <m.de.rooy at rijksmuseum.nl> ---
(In reply to Marc Véron from comment #5)
> Switched to an other vm with a new install, git pull to make sure to be on
> the newest master (is: 16.12.00.024), HEAD is 8e5c9ba Bug 17835: (followup)
> Make TestBuilder skip views, git bz apply 18448, result:
> 
> Wende an: Bug 18448: Fix a few db_dependent tests
> Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis
> nachzustellen
> M	t/db_dependent/Koha.t
> Falle zurück zum Patchen der Basis und des 3-Wege-Merges...
> automatischer Merge von t/db_dependent/Koha.t
> KONFLIKT (Inhalt): Merge-Konflikt in t/db_dependent/Koha.t
> Merge der Änderungen fehlgeschlagen
> Anwendung des Patches fehlgeschlagen bei 0001 Bug 18448: Fix a few
> db_dependent tests

Should be resolved now. Rebased on top of the itemtype changes.

-- 
You are receiving this mail because:
You are watching all bug changes.