[Koha-bugs] [Bug 7317] Add an Interlibrary Loan Module to Circulation and OPAC

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

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

Hugo Agud <hagud at orex.es> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |hagud at orex.es

Alex Sassmannshausen <alex.sassmannshausen at ptfs-europe.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Blocks|                            |18837

--- Comment #54 from Hugo Agud <hagud at orex.es> ---
HI

I have tried to apply the patch on master, but I get an error

Applying: Bug 7317: DO NOT PUSH: Update OPAC CSS
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/css/opac.css
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/opac.css
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/css/opac.css
Failed to merge in the changes.
Patch failed at 0001 Bug 7317: DO NOT PUSH: Update OPAC CSS
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-7317-DO-NOT-PUSH-Update-OPAC-CSS-xvmzXj.patch

--- Comment #55 from Magnus Enger <magnus at libriotech.no> ---
Iam ready to sign off on this, when Alex has provided the missing tests (and
possibly a rebase).


Referenced Bugs:

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18837
[Bug 18837] Add an unmediated Interlibrary Loans workflow
-- 
You are receiving this mail because:
You are watching all bug changes.