[Koha-bugs] [Bug 9508] the dateformat variable is not standardized in template files
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Fri May 3 00:54:31 CEST 2013
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9508
Galen Charlton <gmcharlt at gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Passed QA |Patch doesn't apply
CC| |gmcharlt at gmail.com
--- Comment #11 from Galen Charlton <gmcharlt at gmail.com> ---
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.
More information about the Koha-bugs
mailing list