https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18175
Alex Buckley <alexbuck...@catalyst.net.nz> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |alexbuck...@catalyst.net.nz
--- Comment #2 from Alex Buckley <alexbuck...@catalyst.net.nz> ---
Hi there
Sorry this patch is not applying cleanly on master (as the below output shows),
can you please either rebase the patch or define the Koha version this patch
should be used on?
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 18175: Use Makefile variable for api path.
Using index info to reconstruct a base tree...
M etc/koha-httpd.conf
Falling back to patching base and 3-way merge...
Auto-merging etc/koha-httpd.conf
CONFLICT (content): Merge conflict in etc/koha-httpd.conf
Failed to merge in the changes.
Patch failed at 0001 Bug 18175: Use Makefile variable for api path.
The copy of the patch that failed is found in:
/home/vagrant/kohaclone/.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-18175-Use-Makefile-variable-for-api-path-cy4MsZ.patch
Cheers,
Alex
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://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/
