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

--- Comment #33 from Katrin Fischer <[email protected]> ---
I fixed the first conflict in sysprefs.sql, but then sadly got stuck a bit
later again:

git bz apply --continue
Applying: Bug 18064 : Add syspref to launch longOverdue script with calendar
support
Applying: Bug 18064: (follow-up) Get libraries as a list
Applying: Bug 18064: (QA follow-up) Clean up code
Applying: Bug 18064: (follow-up) Remove statement for summary & reorder
sysprefs
error: sha1 information is lacking or useless
(installer/data/mysql/mandatory/sysprefs.sql).
error: could not build fake ancestor
Patch failed at 0001 Bug 18064: (follow-up) Remove statement for summary &
reorder sysprefs
hint: Use 'git am --show-current-patch=diff' to see the failed 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-18064-follow-up-Remove-statement-for-summary---jkamgi1_.patch

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
[email protected]
https://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/

Reply via email to