[Koha-bugs] [Bug 15540] Debian package option to set up an .onion address ( Tor hidden service) for the OPAC

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #6 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Can't promise to test this, but maybe an email to the mailing list might find
an interested tester?

Smallish conflict:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 15540 - Debian package option to set up an .onion address (Tor
hidden service) for the OPAC
Using index info to reconstruct a base tree...
M       debian/docs/koha-create.xml
M       debian/scripts/koha-create
M       debian/scripts/koha-remove
Falling back to patching base and 3-way merge...
Auto-merging debian/scripts/koha-remove
Auto-merging debian/scripts/koha-create
CONFLICT (content): Merge conflict in debian/scripts/koha-create
Auto-merging debian/docs/koha-create.xml
Failed to merge in the changes.
Patch failed at 0001 Bug 15540 - Debian package option to set up an .onion
address (Tor hidden service) for the OPAC
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-15540---Debian-package-option-to-set-up-an-oni-d0f2n1.patch

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