dcb87cc5b6d91351982761d957b1564b005acf9b
kate
  Fri Jan 8 14:47:16 2021 -0800
Fix merge problem

diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index dc97251..18bf422 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -8624,41 +8624,30 @@
 	hPrintf("<CENTER>");
 	}
 
 
     /* Make line that says position. */
 	{
 	char buf[256];
 	char *survey = cfgOptionEnv("HGDB_SURVEY", "survey");
 	char *surveyLabel = cfgOptionEnv("HGDB_SURVEY_LABEL", "surveyLabel");
 	    char *javascript = "document.location = '/cgi-bin/hgTracks?db=' + document.TrackForm.db.options[document.TrackForm.db.selectedIndex].value;";
 	    if (containsStringNoCase(database, "zoo"))
 		{
 		hPuts("Organism ");
 		printAssemblyListHtmlExtra(database, "change", javascript);
 		}
-        if (sameString(virtModeType, "default"))
-            {
-            hButtonMaybePressed("hgTracksConfigMultiRegionPage", "multi-region", 
-                    "Configure view in multi-region display mode",
-                    "popUpHgt.hgTracks('multi-region config'); return false;", FALSE);
-            }
-        else
-            {
-            hButtonWithMsg("hgt.exitMultiRegion", "exit multi-region", "Exit multi-region display mode");
-            }
-        hPrintf(" ");
 
         /* Multi-region button on position line */
         if (sameString(virtModeType, "default"))
             {
             hButtonMaybePressed("hgTracksConfigMultiRegionPage", "multi-region",
                     "Configure view in multi-region display mode",
                     "popUpHgt.hgTracks('multi-region config'); return false;", FALSE);
             }
         else
             {
             hButtonWithMsg("hgt.exitMultiRegion", "exit multi-region", 
                                 "Exit multi-region display mode");
             }
         hPrintf(" ");