https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14957
--- Comment #141 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- (In reply to Frank Hansen from comment #140) > Katrin, I have already signed off the patches from a sandbox. I'm getting: > koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc: needs merge > > Guess, I don't have a change to do that. > > The sandbox is here: http://sb1.sandboxes.bywatersolutions.com if somebody > want to try. Hi Frank, looks like we might need a rebase - master is changing fast and sometimes there are conflicts in files changed by different patches. We will fix it. -- 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/
