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 3032382..e990cbe 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
@@ -63,6 +63,7 @@
                         %]
                     </td>
                 </tr>
+                <!-- PINES is not yet keeping a history of circ or holds...
                 [%- setting = 'history.circ.retention_start' -%]
                 <tr>
                     <td><label for='[% setting %]'>[% l('Keep history of checked out items?') %]</label></td>
@@ -80,6 +81,7 @@
                     </td>
                 </tr>
                 [%- setting = 'opac.temporary_list_no_warn' -%]
+               -->
                 <tr>
                     <td><label for='[% setting %]'>[% l('Skip warning when adding to temporary book list?') %]</label></td>
                     <td>