PINES is not yet keeping a history of circ or holds

Conflicts:

	Open-ILS/src/templates/opac/myopac/prefs_settings.tt2

diff --git a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
index 415dcec..ff1a08c 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
@@ -76,6 +76,7 @@
                         %]
                     </td>
                 </tr>
+                <!-- PINES is not yet keeping a history of circ or holds...
                 [%- setting = 'history.circ.retention_start' -%]
                 <tr>
                     [% circ_name = l('Keep history of checked out items?') %]
@@ -99,6 +100,7 @@
                     </td>
                 </tr>
                 [%- setting = 'opac.temporary_list_no_warn' -%]
+               -->
                 <tr>
                     [% skip_warn =  l('Skip warning when adding to temporary book list?') %]
                     <td><label for='[% setting %]'>[% skip_warn %]</label></td>