http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9508
Galen Charlton <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply CC| |[email protected] --- Comment #11 from Galen Charlton <[email protected]> --- I too am getting merge conflicts applying this to master: git bz apply 9508 Bug 9508 - the dateformat variable is not standardized in template files [PASSED QA] Bug 9508: Standardize the dateformat value from C4::Auth Apply? [yn] y Applying: Bug 9508: Standardize the dateformat value from C4::Auth Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Auth.pm Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt Auto-merging members/memberentry.pl Failed to merge in the changes. Patch failed at 0001 Bug 9508: Standardize the dateformat value from C4::Auth When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
