[Koha-bugs] [Bug 21626] Add 'current maintenance team' to the 'Koha team' page

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

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

--- Comment #105 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patches don't apply for me - maybe a missing dependency?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 21626: Add teams.yaml to /docs
Applying: Bug 21626: Use teams.yaml for teams section
Using index info to reconstruct a base tree...
M       about.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
Auto-merging about.pl
CONFLICT (content): Merge conflict in about.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 21626: Use teams.yaml for teams section
The copy of the patch that failed is found in: .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-21626-Use-teamsyaml-for-teams-section-igzqn1.patch

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