From db8ddfc002bf63a752eaf310124ced82cd25e6fb Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Fri, 8 May 2009 15:10:13 -0500
Subject: [PATCH] bug 3209: add 'p' (mixed materials) to MARC21 Leader/06
 dropdown

Also made the following updates to the MARC21 leader plugin

[1] Changed description of Leader/08 to 'Type of control'
[2] Fixed typo in description value for 'z' in Leader/17
[3] Updated Leader/19, which is now 'Multipart resource record level'

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
---
 .../value_builder/marc21_leader.tmpl          | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

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 d6d578cff6..bd63397a52 100644
--- 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>
-- 
2.39.5