[Koha-bugs] [Bug 27945] Limit the number of article requests per day per patron category

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

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

--- Comment #11 from Marcel de Rooy <m.de.rooy at rijksmuseum.nl> ---
(In reply to Marcel de Rooy from comment #10)
> (In reply to Marcel de Rooy from comment #9)
> > On top of 27946:
> > 
> > Applying: Bug 27945: Add tests
> > Using index info to reconstruct a base tree...
> > M       t/db_dependent/ArticleRequests.t
> > Falling back to patching base and 3-way merge...
> > Auto-merging t/db_dependent/ArticleRequests.t
> > CONFLICT (content): Merge conflict in t/db_dependent/ArticleRequests.t
> > error: Failed to merge in the changes.
> 
> Wait thats not correct

It does apply correctly. Wrong base..

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