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

[Steve Tonnesen]

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

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


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -C2 -r1.5.2.7 -r1.5.2.8
*** Reserves2.pm        11 Sep 2002 22:23:31 -0000      1.5.2.7
--- Reserves2.pm        12 Sep 2002 13:17:04 -0000      1.5.2.8
***************
*** 31,71 ****
      
  @ISA = qw(Exporter);
- <<<<<<< Reserves2.pm
- @EXPORT = qw(&FindReserves &CheckReserves &CheckWaiting &CancelReserve 
&FillReserve &ReserveWaiting &CreateReserve &updatereserves &Findgroupreserve);
- %EXPORT_TAGS = ( );     # eg: TAG => [ qw!name1 name2! ],
-                 
- # your exported package globals go here,
- # as well as any optionally exported functions
- 
- @EXPORT_OK   = qw($Var1 %Hashit);
- 
- 
- # non-exported package globals go here
- use vars qw(@more $stuff);
-       
- # initalize package globals, first exported ones
- 
- my $Var1   = '';
- my %Hashit = ();
-                   
- # then the others (which are still accessible as $Some::Module::stuff)
- my $stuff  = '';
- my @more   = ();
-       
- # all file-scoped lexicals must be created before
- # the functions below that use them.
-               
- # file-private lexicals go here
- my $priv_var    = '';
- my %secret_hash = ();
-                           
- # here's a file-private function as a closure,
- # callable as &$priv_func;  it cannot be prototyped.
- my $priv_func = sub {
-   # stuff goes here.
- };
- =======
  @EXPORT = qw(&FindReserves &CheckReserves &CheckWaiting &CancelReserve 
&FillReserve &ReserveWaiting &CreateReserve &updatereserves &getreservetitle 
&Findgroupreserve);
- >>>>>>> 1.8
                                                    
  # make all your functions, whether exported or not;
--- 31,35 ----