https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #16 from David Nind <[email protected]> --- Patch doesn't apply 8-( root@34d7e7da5f3f:koha(bz25070)$ git bz apply 25070 Bug 25070 - Include files to display address and contact must be refactored 102487 - Bug 25070: Centralize member-alt-address-style 102488 - Bug 25070: Centralize member-alt-contact-style 102489 - Bug 25070: Centralize member-display-address-style 102490 - Bug 25070: Centralize member-display-alt-address-style 102491 - Bug 25070: Centralize member-main-address-style Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 25070: Centralize member-alt-address-style Applying: Bug 25070: Centralize member-alt-contact-style Applying: Bug 25070: Centralize member-display-address-style Applying: Bug 25070: Centralize member-display-alt-address-style Applying: Bug 25070: Centralize member-main-address-style Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc M koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc M koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc M koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc deleted in Bug 25070: Centralize member-main-address-style and modified in HEAD. Version HEAD of koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc left in tree. CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc deleted in Bug 25070: Centralize member-main-address-style and modified in HEAD. Version HEAD of koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc left in tree. CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc deleted in Bug 25070: Centralize member-main-address-style and modified in HEAD. Version HEAD of koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc left in tree. error: Failed to merge in the changes. Patch failed at 0001 Bug 25070: Centralize member-main-address-style -- 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/
