bug 3209: add 'p' (mixed materials) to MARC21 Leader/06 dropdown

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / cataloguing / value_builder / marc21_leader.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
index d6d578c..bd63397 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
@@ -280,11 +280,16 @@
                <td>
                        <select name="f19" size="1">
                                <!-- TMPL_IF name="f19 " -->
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
                                        <option value=" " selected="selected">Not specified or not applicable </option>
+=======
+                                       <option value=" " SELECTED>Not specified or not applicable </option>
+>>>>>>> 2de58fc... bug 3209: add 'p' (mixed materials) to MARC21 Leader/06 dropdown:koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
                                <!-- TMPL_ELSE -->
                                        <option value=" ">Not specified or not applicable</option>
                                <!-- /TMPL_IF -->
                                <!-- TMPL_IF name="f19a" -->
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
                                        <option value="a" selected="selected">a- Set</option>
                                <!-- TMPL_ELSE -->
                                        <option value="a">a- Set</option>
@@ -297,6 +302,20 @@
                                <!-- TMPL_IF name="f19c" -->
                                        <option value="c" selected="selected">c- Part with dependent title</option>
                                <!-- TMPL_ELSE -->
+=======
+                                       <option value="a" SELECTED>a- Set</option>
+                               <!-- TMPL_ELSE -->
+                                       <option value="a">a- Set</option>
+                               <!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="f19b" -->
+                                       <option value="b" SELECTED>b- Part with independent title</option>
+                               <!-- TMPL_ELSE -->
+                                       <option value="b">b- Part with independent title</option>
+                               <!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="f19c" -->
+                                       <option value="c" SELECTED>c- Part with dependent title</option>
+                               <!-- TMPL_ELSE -->
+>>>>>>> 2de58fc... bug 3209: add 'p' (mixed materials) to MARC21 Leader/06 dropdown:koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
                                        <option value="c">c- Part with dependent title</option>
                                <!-- /TMPL_IF -->
                        </select>