From 67bbd535cad7679f0ab4b8b39696f1c4a6c89271 Mon Sep 17 00:00:00 2001
From: Michael Hafen <mdhafen@tech.washk12.org>
Date: Wed, 10 Sep 2008 13:12:56 -0600
Subject: [PATCH] bug: query squashes issues.timestamp which circulation.pl
 needs to sort todaysissues

Little change to the query so we get the right timestamp to sort on.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
---
 C4/Members.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/C4/Members.pm b/C4/Members.pm
index 8cc32bdc64..7ef8094502 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -999,6 +999,7 @@ The keys include C<biblioitems> fields except marc and marcxml.
 #'
 sub GetPendingIssues {
     my ($borrowernumber) = @_;
+<<<<<<< HEAD:C4/Members.pm
     # must avoid biblioitems.* to prevent large marc and marcxml fields from killing performance
     # FIXME: namespace collision: each table has "timestamp" fields.  Which one is "timestamp" ?
     # FIXME: circ/ciculation.pl tries to sort by timestamp!
-- 
2.39.5