5cc9ef29260486771e65ce4d78e90c90712d61f5
Merge parents b9d5de3 454b3da
kate
  Fri Jun 5 15:44:03 2015 -0700
Conflict resolution

diff --cc src/hg/hgc/hgc.c
index 4eda2a7,34c7317..24a92f6
--- src/hg/hgc/hgc.c
+++ src/hg/hgc/hgc.c
@@@ -25776,35 -25766,31 +25833,35 @@@
      {
      doLrg(tdb, item);
      }
  else if (sameString("lrgTranscriptAli", table))
      {
      doLrgTranscriptPsl(tdb, item);
      }
  else if (sameWord(table, "htcLrgCdna"))
      {
      htcLrgCdna(item);
      }
  else if (startsWith("peptideAtlas", table))
      {
      doPeptideAtlas(tdb, item);
      }
 +else if (startsWith("gtexGene", table))
 +    {
 +    doGtexGeneExpr(tdb, item);
 +    }
- else if (isHubTrack(table) && startsWith("snake", trackHubSkipHubName(table)))
+ else if (startsWith("snake", trackHubSkipHubName(table)))
      {
      doSnakeClick(tdb, item);
      }
  #ifdef USE_TABIX
  else if (tdb != NULL && startsWithWord("vcfTabix", tdb->type))
      {
      doVcfTabixDetails(tdb, item);
      }
  #endif // USE_TABIX
  else if (tdb != NULL && startsWithWord("vcf", tdb->type))
      {
      doVcfDetails(tdb, item);
      }
  else if (tdb != NULL)
      {