[Koha-bugs] [Bug 11317] Add a way to access files from the intranet

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
            Summary|Add a way to access files   |Add a way to access files
                   |from the intranet.          |from the intranet

--- Comment #69 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Sorry, this does no longer apply:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 11317: Adds a page to access log files on the server from the
intranet.
Auto packing the repository in background for optimum performance.
See "git help gc" for manual housekeeping.
Applying: Bug 11317: Follow up - Update ID to allow for permalinking
Auto packing the repository in background for optimum performance.
See "git help gc" for manual housekeeping.
Applying: Bug 11317 - Rename config to 'accessdir' and fix qa
Applying: Bug 11317 - Allows for multiple directories to be accessible
Applying: Bug 11317 - Move file access under Tools and add specific permission
fatal: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 11317 - Move file access under Tools and add specific
permission
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-11317---Move-file-access-under-Tools-and-add-s-D7DJsU.patch

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