https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30063
Arthur Suzuki <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #22 from Arthur Suzuki <[email protected]> --- patch doesn't apply on master, although all dependencies do apply properly :) <pre> 132387 - Bug 30063: Fix table settings Application de Bug 30063: Fix table settings Utilisation de l'information de l'index pour reconstruire un arbre de base... M koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt 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 error: Échec d'intégration des modifications. l'application de la rustine a échoué à 0001 Bug 30063: Fix table settings astuce: Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec 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". Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-30063-Fix-table-settings-7voPZp.patch </pre> -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
