https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38544
Alex Buckley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #9 from Alex Buckley <[email protected]> --- Hi Fridolin, This patchset conflicts when cherry-picked from 24.11.x to 24.05.x --- kohadev-koha@kohadevbox:koha(24.05.x)$ git cherry-pick 89c88244089bb9ede369d04541f73b91987efb9d Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc error: could not apply 89c88244089... Bug 38544: OPAC Modal login not generated when OPAC login is disabled hint: After resolving the conflicts, mark them with hint: "git add/rm <pathspec>", then run hint: "git cherry-pick --continue". hint: You can instead skip this commit with "git cherry-pick --skip". hint: To abort and get back to the state before "git cherry-pick", hint: run "git cherry-pick --abort". kohadev-koha@kohadevbox:koha(24.05.x|CHERRY-PICKING)$ git status On branch 24.05.x You are currently cherry-picking commit 89c88244089. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Unmerged paths: (use "git add <file>..." to mark resolution) both modified: koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc no changes added to commit (use "git add" and/or "git commit -a") kohadev-koha@kohadevbox:koha(24.05.x|CHERRY-PICKING)$ --- Could we please have a 24.05.x rebased patch attached to this bug report? -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
