From c643f3e3a1f48cf4071a4547a313c4439401c8f8 Mon Sep 17 00:00:00 2001
From: finlayt <finlayt>
Date: Mon, 30 Sep 2002 23:08:47 +0000
Subject: [PATCH] small conflict resolution

---
 C4/Reserves2.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/C4/Reserves2.pm b/C4/Reserves2.pm
index 7b8fdfa8c3..d8a3b3088c 100755
--- a/C4/Reserves2.pm
+++ b/C4/Reserves2.pm
@@ -31,6 +31,7 @@ $VERSION = 0.01;
     
 @ISA = qw(Exporter);
 @EXPORT = qw(&FindReserves &CheckReserves &CheckWaiting &CancelReserve &FillReserve &ReserveWaiting &CreateReserve &updatereserves &getreservetitle &Findgroupreserve);
+
 						    
 # make all your functions, whether exported or not;
 
-- 
2.39.5