From c60cf38d99be403a57afaf6d2badd3b17956c2d7 Mon Sep 17 00:00:00 2001
From: tonnesen <tonnesen>
Date: Thu, 12 Sep 2002 13:17:04 +0000
Subject: [PATCH] Removing conflicting lines

---
 C4/Reserves2.pm | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/C4/Reserves2.pm b/C4/Reserves2.pm
index bf05b6fd48..7b8fdfa8c3 100755
--- a/C4/Reserves2.pm
+++ b/C4/Reserves2.pm
@@ -30,43 +30,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 $VERSION = 0.01;
     
 @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;
 
-- 
2.39.5