From 2fb30705142505c86b1929c70fc248be53e13a07 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chris@bigballofwax.co.nz>
Date: Fri, 4 Sep 2009 13:18:58 +1200
Subject: [PATCH] Fixing up mess after conflict

---
 C4/Members.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index 7ef8094502..8cc32bdc64 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -999,7 +999,6 @@ 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