[Koha-bugs] [Bug 16369] Clean up and improve plugins template

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16369

Arslan Farooq <arslanone at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |arslanone at gmail.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #2 from Arslan Farooq <arslanone at gmail.com> ---
Hi Owen,

when applying the patch, it says:

--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 16369 - Clean up and improve plugins template
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/tools/tools-home.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
Failed to merge in the changes.
Patch failed at 0001 Bug 16369 - Clean up and improve plugins template
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

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