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

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Mon Nov 14 14:46:17 CET 2011


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

--- Comment #2 from Owen Leonard <oleonard at myacpl.org> 2011-11-14 13:46:17 UTC ---
Sorry, my description of the problem is clearly wrong, so pay no attention to
that. The conflicts are there, however:

<<<<<<< HEAD

        [% IF ( soundon ) %]
        <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay"
autobuffer="autobuffer"></audio>
        [% END %]

    <div class="dialog message">
=======

[% IF ( soundon ) %]
<audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay"
autobuffer="autobuffer"></audio>
[% END %]

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

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


More information about the Koha-bugs mailing list