[Koha-bugs] [Bug 7220] Returns page message boxes being ignored

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220

Owen Leonard <oleonard at myacpl.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Priority|P5 - low                    |PATCH-Sent
             Status|NEW                         |ASSIGNED
       Patch Status|---                         |Failed QA
         AssignedTo|kyle.m.hall at gmail.com       |chrish at catalyst.net.nz

--- Comment #1 from Owen Leonard <oleonard at myacpl.org> 2011-11-14 13:40:31 UTC ---
I get a conflict when I try to apply this patch, either by git bz apply or git
am -i3u. Viewing the conflict, it looks like there's an error in the changes
made by this patch:

<<<<<<< HEAD
[% END %]

<div class="dialog message">
=======
[% END %]    

<div id="hold-found1" class="dialog message">
>>>>>>> made appropriate changes so that user can customise the display of messages on the returns page as per wr87151

This reverses the order of the [% END %] and the <div> which doesn't look
correct.

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching all bug changes.