--- loncom/lonnet/perl/lonnet.pm	2001/03/22 15:08:49	1.112
+++ loncom/lonnet/perl/lonnet.pm	2001/03/22 16:13:22	1.115
@@ -93,6 +93,7 @@
 # 3/2 Gerd Kortemeyer
 # 3/15 Scott Harrison
 # 3/19,3/20 Gerd Kortemeyer
+# 3/22 Scott Harrison
 
 package Apache::lonnet;
 
@@ -1242,22 +1243,19 @@ sub definerole {
 # ---------------- Make a metadata query against the network of library servers
 
 sub metadata_query {
-<<<<<<< lonnet.pm
     my ($query,$custom)=@_;
+    # need to put in a loop here and return list
     unless ($custom) {
 	my $reply=&reply("querysend:".&escape($query),'msul3');
 	return $reply;
     }
     else {
 	my $reply=&reply("querysend:".&escape($query).':'.
-			 &escape($customquery),'msul3');
+			 &escape($custom),'msul3');
 	return $reply;
     }
-=======
     my ($query)=@_;
-    # need to put in a loop here and return list
     my $reply=&reply("querysend:".&escape($query),'msul3');
->>>>>>> 1.111
 }
 
 # ------------------------------------------------------------------ Plain Text