https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15540
Liz Rea <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #3 from Liz Rea <[email protected]> --- Hi Mirko, It looks like this doesn't apply anymore. :( 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 CONFLICT (content): Merge conflict in debian/docs/koha-create.xml Liz -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
