https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21167
Michal Denar <blac...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |blac...@gmail.com
--- Comment #7 from Michal Denar <blac...@gmail.com> ---
Please rebase on master.
M koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
M koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
Thanks
Mike
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://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/
