[Koha-bugs] [Bug 33703] Entering dates should be more flexible accepting different entry formats

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33703

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #17 from David Nind <david at davidnind.com> ---
The patch no longer applies 8-(..

155719 - Bug 33703: Add cleave.js for direct input dateformatting
155861 - Bug 33703: (follow-up) declare variables
155862 - Bug 33703: Add cleave.js (OPAC)

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 33703: Add cleave.js for direct input dateformatting
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 33703: Add cleave.js for direct input dateformatting

-- 
You are receiving this mail because:
You are watching all bug changes.