[Koha-bugs] [Bug 8137] Checkout limit by patron category for all libraries

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

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

Victor Grousset/tuxayo <victor.grousset at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |victor.grousset at biblibre.co
                   |                            |m

--- Comment #23 from Victor Grousset/tuxayo <victor.grousset at biblibre.com> ---
Conflicts:

~/d/koha ❯❯❯ git bz apply 8137
Bug 8137 - Checkout limit by patron category for all libraries

64704 - Bug 8137 - Add Default checkout limit by patron category with priority.
64891 - Bug 8137 - Add default issuing rule for all branches.

Apply? [(y)es, (n)o, (i)nteractive] y
Application de  Bug 8137 - Add Default checkout limit by patron category with
priority.
.git/rebase-apply/patch:20: trailing whitespace.
                $count_query .= " JOIN  biblioitems USING (biblionumber) 
warning: 1 ligne a ajouté des erreurs d'espace.
Utilisation de l'information de l'index pour reconstruire un arbre de base...
M       C4/Circulation.pm
M       admin/smart-rules.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
M       t/db_dependent/Circulation/Branch.t
.git/rebase-apply/patch:20: trailing whitespace.
                $count_query .= " JOIN  biblioitems USING (biblionumber) 
warning: 1 ligne a ajouté des erreurs d'espace.
Retour à un patch de la base et fusion à 3 points...
Fusion automatique de t/db_dependent/Circulation/Branch.t
Fusion automatique de
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
Fusion automatique de admin/smart-rules.pl
CONFLIT (contenu) : Conflit de fusion dans admin/smart-rules.pl
Fusion automatique de C4/Circulation.pm
error: Échec d'intégration des modifications.
le patch a échoué à 0001 Bug 8137 - Add Default checkout limit by patron
category with priority.
La copie du patch qui a échoué se trouve dans : .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-8137---Add-Default-checkout-limit-by-patron-ca-NJzNl6.patch

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