[Koha-bugs] [Bug 19954] Update popup window templates to use Bootstrap grid: Patrons
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Fri Feb 16 07:46:40 CET 2018
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19954
Katrin Fischer <katrin.fischer at bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
QA Contact|katrin.fischer at bsz-bw.de |
Status|Signed Off |Patch doesn't apply
--- Comment #6 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Please rebase!
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19954: Update popup window templates to use Bootstrap grid:
Patrons
Using index info to reconstruct a base tree...
M koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 19954: Update popup window templates to use Bootstrap
grid: Patrons
The copy of the patch that failed is found in: .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-19954-Update-popup-window-templates-to-use-Boo-iaYLLo.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list