[Koha-bugs] [Bug 2889] templates should use [% IF ( loop.odd ) %]

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Fri Sep 19 22:03:04 CEST 2014


http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=2889

Nick Clemens <nick at quecheelibrary.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |nick at quecheelibrary.org

--- Comment #12 from Nick Clemens <nick at quecheelibrary.org> ---
Applying: BUG: 2889 template aqbasketusersearch add loop.odd
Applying: Bug 2889 - templates should use [% IF ( loop.odd ) %] -
Administration
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
Failed to merge in the changes.
Patch failed at 0001 Bug 2889 - templates should use [% IF ( loop.odd ) %] -
Administration
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-2889---templates-should-use--IF--loopodd-----A-zUC7yD.patch
nick at debian:~/koha$

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


More information about the Koha-bugs mailing list