https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18060
Lee Jamison <ldjami...@marywood.edu> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ldjami...@marywood.edu --- Comment #10 from Lee Jamison <ldjami...@marywood.edu> --- The 18002 dependency applies cleanly (tested during this bug as well as tested 18002 independently as well). However, this bug does not apply. See merge conflict message below. Applying: Bug 18060 - Label onboarding tool to be displayed when no labels or templates exist Using index info to reconstruct a base tree... M C4/Budgets.pm M acqui/acqui-home.pl M admin/aqbudgetperiods.pl M admin/aqbudgets.pl M admin/currency.pl M koha-tmpl/intranet-tmpl/prog/css/staff-global.css M koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt <stdin>:749: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude3.inc CONFLICT (add/add): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude3.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc CONFLICT (add/add): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude1.inc CONFLICT (add/add): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude1.inc Auto-merging koha-tmpl/intranet-tmpl/prog/css/staff-global.css CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/css/staff-global.css Failed to merge in the changes. Patch failed at 0001 Bug 18060 - Label onboarding tool to be displayed when no labels or templates exist The copy of the patch that failed is found in: /home/vagrant/kohaclone/.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-18060---Label-onboarding-tool-to-be-displayed--p4jDwr.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org http://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/