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

--- Comment #44 from Paul Derscheid <[email protected]> ---
There are some merge conflict markers in attachment 204554:
+<<<<<<< HEAD
                     </div>
                     <div class="hint">Sets this SMTP server as the default
SMTP server.</div>
                 </div>
+=======
+                        <span class="hint">Sets this SMTP server as the
default SMTP server.</span>
+                    </li>
+                    <li>
+                        <label for="transport_module">Transport module:
</label>
+                        <select name="transport_module" id="transport_module">
+                            <option value="default">Default</option>
+                            [% FOREACH transport_module IN
available_transport_modules %]
+                                [% IF ( smtp_server.transport_module ==
transport_module ) %]
+                                    <option value="[% transport_module | html
%]" selected>[% transport_module | html %]</option>
+                                [% ELSE %]
+                                    <option value="[% transport_module | html
%]">[% transport_module | html %]</option>
+                                [% END %]
+                            [% END %]
+                        </select>
+                        <span class="hint">Email transport module to use. When
in doubt, use "Default".</span>
+                    </li>
+                </ol>
+>>>>>>> Bug 42870: Add email transport config to smtp_servers

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list -- [email protected]
To unsubscribe send an email to [email protected]
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

Reply via email to