05ccc5f7743fcccebdfd8b59c11374c23ad61bc7
Merge parents a7843fa b505056
larrym
  Mon Jun 25 11:28:23 2012 -0700
resolve merge conflict with master
diff --cc src/hg/hgFileUi/hgFileUi.c
index a58387d,a47a296..a7394e8
--- src/hg/hgFileUi/hgFileUi.c
+++ src/hg/hgFileUi/hgFileUi.c
@@@ -122,24 -128,25 +128,24 @@@
      }
  cartWebStart(cart, db, "%s %s", tdb->shortLabel, DOWNLOADS_ONLY_TITLE);
  
  if (!tdbIsComposite(tdb) && !tdbIsDownloadsOnly(tdb))
      {
      warn("Track '%s' of type %s is not supported by hgFileUi.",track, tdb->type);
      return;
      }
  
  fileUi(cart, tdb, db, chrom, FALSE);
  
  printf("<BR>\n");
  webEnd();
  }
  
- char *excludeVars[] = { "submit", "Submit", "g", "clearCache", "ajax", NULL,};  // HOW IS 'ajax" going to be supported?
+ char *excludeVars[] = { "submit", "Submit", "g", "clearCache", "ajax", NULL,};
  
  int main(int argc, char *argv[])
  /* Process command line. */
  {
  cgiSpoof(&argc, argv);
 -htmlSetBackground(hBackgroundImage());
  cartEmptyShell(doMiddle, hUserCookie(), excludeVars, NULL);
  return 0;
  }