[Bug 12365] Notes for rules

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view

[Bug 12365] Notes for rules


Lisette Scheer <[hidden email]> changed:

           What    |Removed                     |Added
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #29 from Lisette Scheer <[hidden email]> ---
Falling back to patching base and 3-way merge...
error: The following untracked working tree files would be overwritten by
Please move or remove them before you can merge.
Failed to merge in the changes.
Patch failed at 0001 Bug 12365: Notes for rules
The copy of the patch that failed is found in:
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-12365-Notes-for-rules-Ei3222.patch


You are receiving this mail because:
You are watching all bug changes.
Koha-bugs mailing list
[hidden email]
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/