[Koha-cvs] CVS: koha/C4 Reserves2.pm,1.5.2.8,1.5.2.9

[Finlay Thompson]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv7181/C4

Modified Files:
      Tag: rel-1-2
        Reserves2.pm 
Log Message:

small conflict resolution



Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.5.2.8
retrieving revision 1.5.2.9
diff -C2 -r1.5.2.8 -r1.5.2.9
*** Reserves2.pm        12 Sep 2002 13:17:04 -0000      1.5.2.8
--- Reserves2.pm        30 Sep 2002 23:08:47 -0000      1.5.2.9
***************
*** 32,35 ****
--- 32,36 ----
  @ISA = qw(Exporter);
  @EXPORT = qw(&FindReserves &CheckReserves &CheckWaiting &CancelReserve 
&FillReserve &ReserveWaiting &CreateReserve &updatereserves &getreservetitle 
&Findgroupreserve);
+ 
                                                    
  # make all your functions, whether exported or not;