--- loncom/lonnet/perl/lonnet.pm	2001/03/22 15:08:49	1.112
+++ loncom/lonnet/perl/lonnet.pm	2001/03/22 15:10:35	1.113
@@ -1242,8 +1242,8 @@ 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;
@@ -1253,11 +1253,8 @@ sub metadata_query {
 			 &escape($customquery),'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