https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39951
Roman Dolny <roman.do...@jezuici.pl> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #3 from Roman Dolny <roman.do...@jezuici.pl> ---
Thanks for patch, unfortunetely it doesn't apply.
kohadev-koha@kohadevbox:koha(bug_39951)$ git bz apply 39951
Bug 39951 - No filter for Name column in licenses table in ERM
182686 - Bug 39951: Fix column filter offsets
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 39951: Fix column filter offsets
Using index info to reconstruct a base tree...
M koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
M koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
Auto-merging
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
error: Failed to merge in the changes.
Patch failed at 0001 Bug 39951: Fix column filter offsets
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
https://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/
