--- loncom/interface/lonnavmaps.pm	2003/01/13 22:41:20	1.126
+++ loncom/interface/lonnavmaps.pm	2003/01/14 01:42:52	1.127
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.126 2003/01/13 22:41:20 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.127 2003/01/14 01:42:52 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -273,12 +273,6 @@ sub real_handler {
     $mapIterator->next(); # discard the first BEGIN_MAP
     my $curRes = $mapIterator->next();
     my $counter = 0;
-<<<<<<< lonnavmaps.pm
-
-    # We only need to do this if we need to open the maps to show the
-    # current position
-    while ($depth > 0 && !$ENV{'form.alreadyHere'}) {
-=======
     my $foundJump = ($jumpType == $NOTHING); # look for jump point if we have one
     my $looped = 0; 
 
@@ -286,7 +280,6 @@ sub real_handler {
     # current position. This will change the counter so we can't count
     # for the jump marker with this loop.
     while ($depth > 0 && !$ENV{'form.alreadyHere'}) {
->>>>>>> 1.122
         if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
         if ($curRes == $mapIterator->END_MAP()) { $depth--; }
 
@@ -305,9 +298,6 @@ sub real_handler {
             }
             $ENV{'form.alreadyHere'} = 1;
         }
-<<<<<<< lonnavmaps.pm
-            
-=======
         $looped = 1;
 
         $curRes = $mapIterator->next();
@@ -337,7 +327,6 @@ sub real_handler {
             $foundJump = 1;
         }
 
->>>>>>> 1.122
         $curRes = $mapIterator->next();
     }
     
@@ -699,7 +688,7 @@ sub real_handler {
 
     $navmap->untieHashes();
 
-    $r->print("<h1>Course Map Untied</h1></body></html>");
+    $r->print("<h1>Untied Hashes</h1></body></html>");
 
     return OK;
 }
@@ -1490,10 +1479,6 @@ sub new {
             if ($curRes == $iterator->END_MAP()) { $depth--; }
         
             if (ref($curRes)) {
-<<<<<<< lonnavmaps.pm
-                # If there's only one resource, this will save it
-                $resource = $curRes; $resourceCount++;
-=======
                 # If there's only one resource, this will save it
                 # we have to filter empty resources from consideration here,
                 # or even "empty", redirecting maps have two (start & finish)
@@ -1501,7 +1486,6 @@ sub new {
                 if($direction == FORWARD && $curRes->src()) { 
                     $resource = $curRes; $resourceCount++; 
                 }
->>>>>>> 1.122
                 my $resultingVal = $curRes->{DATA}->{$valName};
                 my $nextResources = $curRes->$nextResourceMethod();
                 my $nextCount = scalar(@{$nextResources});