[Koha-bugs] [Bug 3137] Add sys pref to collapse areas of the patron add by default

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #16 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
I've switched the sequence of patches when applying, but still get a conflict:

Apply? [(y)es, (n)o, (i)nteractive] i
Applying: Bug 3137: HideFieldsPatronAddForm syspref
Applying: Bug 21156: (RM follow-up) Add missing filters
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 21156: (RM follow-up) Add missing filters
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-21156-RM-follow-up-Add-missing-filters-BipPBa.patch

Can you please rebase?

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.