[Koha-bugs] [Bug 15283] Switch default ISSUEQSLIP notice to Template Toolkit

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

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

Mirko Tietgen <mirko at abunchofthings.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |mirko at abunchofthings.net
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #7 from Mirko Tietgen <mirko at abunchofthings.net> ---
Wende an: Bug 15283 - Switch default ISSUEQSLIP notice to Template Toolkit
fatal: sha1 information is lacking or useless
(installer/data/mysql/de-DE/mandatory/sample_notices.sql).
Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge
zurückzufallen.
Kann nicht zu 3-Wege-Merge zurückfallen.
Anwendung des Patches fehlgeschlagen bei 0001 Bug 15283 - Switch default
ISSUEQSLIP notice to Template Toolkit
Die Kopie des fehlgeschlagenen Patches befindet sich in:
   /home/mirko/koha/.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-15283---Switch-default-ISSUEQSLIP-notice-to-Te-CHhaFv.patch

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