[Koha-bugs] [Bug 19882] Add Novelist Select staff client profile
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Mon Mar 12 16:54:32 CET 2018
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19882
Victor Grousset/tuxayo <victor.grousset at biblibre.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |victor.grousset at biblibre.co
| |m
--- Comment #2 from Victor Grousset/tuxayo <victor.grousset at biblibre.com> ---
conflicts:
~/d/koha ❯❯❯ git bz apply 19882
Bug 19882 - Add Novelist Select staff client profile
70171 - Bug 19882 - Add Novelist Select staff client profile
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19882 - Add Novelist Select staff client profile
Using index info to reconstruct a base tree...
M installer/data/mysql/sysprefs.sql
M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
Auto-merging installer/data/mysql/sysprefs.sql
error: Failed to merge in the changes.
Patch failed at 0001 Bug 19882 - Add Novelist Select staff client profile
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-19882---Add-Novelist-Select-staff-client-profi-lR7BtR.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list