[Koha-bugs] [Bug 19909] Show attributes in patron search results

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

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

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

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

--- Comment #3 from Victor Grousset/tuxayo <victor.grousset at biblibre.com> ---
conflicts:
~/d/koha ❯❯❯ git bz apply 19909                                                
                                                                               
                       ✘ 141 
Bug 19909 - Show attributes in patron search results

70243 - Bug 19909: Show attributes in patron search results

Apply? [(y)es, (n)o, (i)nteractive] y
Application de  Bug 19909: Show attributes in patron search results
Utilisation de l'information de l'index pour reconstruire un arbre de base...
M       C4/Utils/DataTables/Members.pm
M       admin/columns_settings.yml
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
.git/rebase-apply/patch:182: new blank line at EOF.
+
warning: 1 ligne a ajouté des erreurs d'espace.
Retour à un patch de la base et fusion à 3 points...
Fusion automatique de koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
CONFLIT (contenu) : Conflit de fusion dans
koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
Fusion automatique de admin/columns_settings.yml
Fusion automatique de C4/Utils/DataTables/Members.pm
error: Échec d'intégration des modifications.
le patch a échoué à 0001 Bug 19909: Show attributes in patron search results
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-19909-Show-a

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